8394619bac
gnu: Simplify package inputs.
...
This commit was obtained by running:
./pre-inst-env guix style
without any additional argument.
2021-12-13 17:48:25 +01:00
6933a32b8b
gnu: cmake-bootstrap: Update to 3.21.3.
...
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.21.3.
(cmake)[source]: Delete field, updating the package to 3.21.3 also. Remove
trailing #t.
(%common-disabled-tests) <CMake.FileDownload>: Add test.
2021-11-11 12:18:15 -05:00
f762d63ec0
gnu: cmake: Skip CPack TXZ test on i686.
...
Fixes <https://issues.guix.gnu.org/50617 >.
* gnu/packages/cmake.scm (%common-build-phases): Turn into a procedure
and adjust users. When 'target-x86-32?' returns true, add
'skip-cpack-txz-test'.
2021-09-21 10:08:35 +02:00
b029be2ee0
Merge branch 'master' into core-updates-frozen
...
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
2021-07-29 22:34:57 +02:00
c486a61c27
gnu: cmake: Update to 3.21.1.
...
* gnu/packages/cmake.scm (cmake): Update to 3.21.1.
[arguments]: Skip one more test.
2021-07-28 20:31:05 +02:00
1539af46d0
gnu: CMake: Update to 3.20.2.
...
* gnu/packages/cmake.scm (%common-disabled-tests): Don't disable BootstrapTest.
(cmake-bootstrap): Update to 3.20.2.
[source](modules, snippet): Move from here ...
(cmake-minimal)[source]: ... to here.
* gnu/packages/patches/mariadb-cmake-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/databases.scm (mariadb)[source](patches): Add it.
2021-05-09 23:43:32 +02:00
a8448da0f4
Merge branch 'master' into core-updates
2021-03-06 00:18:30 +00:00
8bd0632a02
gnu: cmake-shared: Update to 1.1.0-32.
...
* gnu/packages/cmake.scm (cmake-shared): Update to 1.1.0-32.
[source]: Add snippet to remove bundled sources.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
2021-02-15 18:59:27 +01:00
e740cc6140
Merge branch 'master' into core-updates
2021-02-03 09:57:35 +00:00
79389ac37f
gnu: Add cmake-shared.
...
* gnu/packages/cmake.scm (cmake-shared): New variable.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
2021-01-31 09:22:49 +01:00
9ea8616b37
gnu: cmake-bootstrap: Update to 3.19.2.
...
* gnu/packages/cmake.scm (%preserved-third-party-files): Repatriate from the
cmake package definition.
(cmake-bootstrap): Update to 3.19.2.
(cmake): Remove the version and source field overrides.
2020-12-30 08:40:43 -05:00
4969b51d17
gnu: cmake: Update to 3.19.2.
...
* gnu/packages/cmake.scm (cmake): Update to 3.19.2.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2020-12-26 19:18:19 +08:00
c78964efa8
gnu: Remove 'curl-minimal'.
...
* gnu/packages/curl.scm (curl-minimal): Deprecate variable.
* gnu/packages/games.scm (yamagi-quake2)[inputs]: Replace CURL-MINIMAL with
CURL.
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Likewise.
(cmake-minimal)[inputs]: Don't override the "curl" input.
2020-12-17 00:15:49 +01:00
ff01206345
Merge remote-tracking branch 'origin/master' into core-updates
2020-11-29 17:34:18 +00:00
40e96a4f3a
gnu: cmake: Update to 3.19.1.
...
* gnu/packages/cmake.scm (cmake): Update to 3.19.1.
2020-11-26 23:32:29 +01:00
5458648302
gnu: cmake: Update to 3.19.0.
...
* gnu/packages/cmake.scm (cmake): Update to 3.19.0.
[source]: Modify inherited source to adjust the hash as well as the snippet so
that the "Utilities/cm3p" sub-directory is preserved.
[phases]{patch-bin-sh, check}: Temporarily overrides until the next rebuild
cycle.
2020-11-24 02:20:31 -05:00
f6dbca83bf
gnu: cmake-minimal: Remove some documentation.
...
These files are still available in the user-facing cmake package.
* gnu/packages/cmake.scm (cmake-minimal)[arguments]: Add phase to remove
help documentation.
2020-11-19 18:47:25 +02:00
8d16f302e6
gnu: cmake: Only build ccmake on user facing cmake.
...
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Remove ncurses.
(cmake)[inputs]: Add ncurses.
2020-11-19 18:47:19 +02:00
b8515f729b
gnu: cmake: Update source URI.
...
* gnu/packages/cmake.scm (cmake-bootstrap)[source]: Update to new source
URI.
2020-11-08 23:35:01 +02:00
a7c3c5dcca
gnu: cmake: Remove "libuv" dependency for the Hurd.
...
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: When compiling for the
Hurd, remove "libuv".
2020-04-20 08:00:25 +02:00
aca00b0a36
gnu: CMake: Update to 3.16.5.
...
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.16.5.
2020-03-05 23:36:07 +01:00
c37f9be952
gnu: CMake: Update to 3.16.4.
...
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.16.4.
2020-02-15 22:02:57 +01:00
f9dcc39ac1
gnu: CMake: Do not use source files from system libarchive.
...
* gnu/packages/cmake.scm (%common-build-phases): Remove phase
'use-system-libarchive'.
(%preserved-third-party-files): New variable.
(cmake-bootstrap)[native-inputs]: Remove.
[source](snippet): Rewrite in terms of FILE-SYSTEM-FOLD, and
preserve two files from the bundled libarchive.
(cmake-minimal)[source](snippet): Adjust accordingly.
2020-02-15 22:02:57 +01:00
ac841750a5
gnu: cmake: Fix cross-compilation.
...
* gnu/packages/cmake.scm (cmake-bootstrap)[native-inputs]: Move everything
except (PACKAGE-SOURCE LIBARCHIVE) ...
[inputs]: ... here.
* gnu/packages/cmake.scm (cmake-minimal)[native-inputs, inputs]: Adjust accordingly.
2020-01-26 13:39:19 +01:00
28ba01aec6
gnu: cmake: Enable debugging information.
...
* gnu/packages/cmake.scm (cmake)[arguments]: Set #:build-type.
2020-01-26 13:39:18 +01:00
11f4d87756
gnu: cmake: Remove bundled LibUV.
...
* gnu/packages/cmake.scm (cmake-minimal)[source](snippet): Delete
'Utilities/cmlibuv'.
2020-01-26 13:39:18 +01:00
013c5c23f9
gnu: cmake, cmake-minimal: Use cmake-build-system.
...
This allows removing the bundled LibUV in a subsequent commit. This commit
alone makes no functional changes apart from the build system adjustments.
* gnu/packages/cmake.scm (%common-build-phases, %common-disabled-tests): New
variables.
(cmake-bootstrap)[arguments]: Refactor to use the shared phases and tests.
(cmake-minimal)[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Adjust accordingly.
(cmake)[arguments]: Likewise.
2020-01-26 13:38:57 +01:00
ed24dda76d
gnu: CMake: Remove most bundled libraries.
...
* gnu/packages/cmake.scm (cmake-bootstrap)[source](modules): Add (ice-9 ftw).
[source](snippet): Change to a whitelist approach, keeping "jsoncpp" and "libuv".
[arguments]: Add phase "use-system-libarchive". Remove substitution of deleted file.
[native-inputs]: Add (PACKAGE-SOURCE LIBARCHIVE)
[license]: Remove LICENSE:BSD-4 and LICENSE:BSD-2.
2020-01-25 14:44:53 +01:00
b5fc075d01
gnu: cmake-minimal: Remove bundled jsoncpp.
...
* gnu/packages/cmake.scm (cmake-minimal)[source](snippet): New field. Purge
bundled jsoncpp.
[inputs]: Add JSONCPP.
[arguments]: Adjust accordingly.
* gnu/packages/serialization.scm (jsoncpp)[arguments]: For native builds, use
CMAKE-BOOTSTRAP.
2020-01-25 14:21:03 +01:00
7c1ea9316a
gnu: cmake-minimal-bootstrap: Rename to cmake-bootstrap.
...
...and change the inheritance order while at it, to prepare for the next commit.
* gnu/packages/cmake.scm (cmake-minimal): Rename to ...
(cmake-bootstrap): ... this.
[name]: Set to "cmake-bootstrap".
[native-inputs]: Change from CURL to CURL-MINIMAL.
(cmake-minimal-bootstrap): Remove variable.
(cmake-minimal): New variable, inherits from CMAKE-BOOTSTRAP.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Change from
CMAKE-MINIMAL-BOOTSTRAP to CMAKE-BOOTSTRAP.
2020-01-25 14:19:14 +01:00
fa8e0a5387
gnu: cmake: Build an optimized executable.
...
* gnu/packages/cmake.scm (cmake-bootstrap)[arguments]: Pass
"-DCMAKE_BUILD_TYPE" in #:configure-flags.
2020-01-25 12:50:57 +01:00
ff5733d186
gnu: libjpeg-turbo: Build with a minimal variant of CMake.
...
This is necessary to avoid a circular dependency in the next commit.
* gnu/packages/curl.scm (curl-minimal): New public variable.
* gnu/packages/cmake.scm (cmake-minimal-bootstrap): New public variable.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add #:cmake.
2020-01-22 22:12:33 +01:00
848a3cdb4f
gnu: cmake: Update to 3.16.3.
...
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.3.
2020-01-22 22:12:32 +01:00
3cfe76bec0
Merge branch 'master' into core-updates
2020-01-15 00:09:46 +01:00
79154f0a09
gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.
...
* gnu/packages/cmake.scm (cmake-3.15.5)[native-search-paths]: New field.
2020-01-12 00:19:09 +01:00
0de28f9ef9
gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch".
...
* gnu/packages/cmake.scm (cmake-3.15.5)[source]: Add 'patches' field.
(cmake/fixed): Turn into a deprecated alias for CMAKE-3.15.5.
2020-01-12 00:19:09 +01:00
9039f0b7b6
gnu: CMake: Update to 3.16.2.
...
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.2.
2020-01-08 21:56:03 +01:00
47c4c1fe23
gnu: CMake: Update to 3.16.0.
...
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.0.
[arguments]: Adjust for renamed file. Disable test RunCMake.install.
* gnu/packages/patches/cmake-curl-certificates.patch: Adjust context.
2019-12-05 17:59:02 +01:00
a4de5cfd2f
gnu: Remove cmake/fixed.
...
* gnu/packages/cmake.scm (cmake/fixed): Remove variable.
(cmake-minimal)[source](patches): Add "cmake-curl-certificates.patch".
2019-12-05 17:59:02 +01:00
154d97abdd
Merge remote-tracking branch master into core-updates
2019-11-16 09:34:27 +01:00
528b52390d
gnu: CMake: Add version 3.15.5.
...
Add CMake version 3.15.5 but do not replace the existing version to avoid
triggering the rebuild of all CMake-based packages.
See <https://issues.guix.gnu.org/issue/38060 >.
* gnu/packages/cmake.scm (cmake-3.15.5): Add CMake 3.15.5.
Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2019-11-15 19:09:13 +01:00
a8446b4029
gnu: cmake: Fix cross-compilation.
...
* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ...
[native-inputs]: ... here, except for ncurses.
2019-11-15 17:32:27 +01:00
534537e2ef
gnu: cmake: Fix cross-compilation.
...
* gnu/packages/cmake.scm (cmake-minimal-cross): New package.
* guix/build-system/cmake.scm (default-cmake): Add new target argument and use
it to select cmake-minimal or cmake-minimal-cross.
(lower): Pass target to default-cmake.
2019-11-15 17:32:25 +01:00
9ff87bb996
Merge branch 'master' into core-updates
2019-09-17 16:27:15 +02:00
489d16577e
gnu: cmake: Add package variant that knows about X.509 certificates.
...
Fixes <https://bugs.gnu.org/37371 >.
* gnu/packages/patches/cmake-curl-certificates.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cmake.scm (cmake/fixed): New variable.
2019-09-11 00:09:39 +02:00
5a7c6d02b2
gnu: emacs-cmake-mode: Do not inherit inputs and outputs from CMake.
...
* gnu/packages/cmake.scm (emacs-cmake-mode)[native-inputs, inputs, outputs]:
New fields.
[arguments]: End phases on #t.
2019-08-01 15:49:28 +02:00
14767d4466
gnu: CMake: Update to 3.15.1.
...
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.15.1.
[arguments]: Do not patch /bin/sh in removed file.
2019-07-31 14:41:36 +02:00
2489acc9bd
gnu: CMake: Update to 3.14.5.
...
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.5.
2019-06-15 23:47:34 +02:00
45771d63c5
gnu: cmake: Update to 3.14.4.
...
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.4.
2019-05-25 00:47:53 +02:00
57df83e07d
Merge branch 'staging' into core-updates
2019-05-25 00:25:15 +02:00
Ludovic Courtès
Maxim Cournoyer
Marius Bakke
Ricardo Wurmus
Christopher Baines
Raghav Gururajan
Greg Hogan
Tobias Geerinckx-Rice
Efraim Flashner
Jan (janneke) Nieuwenhuizen
Marius Bakke
Ludovic Courtès
Mathieu Othacehe
Ivan Vilata-i-Balaguer
Pierre-Moana Levesque