1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Commit Graph

148 Commits

Author SHA1 Message Date
Ludovic Courtès
1ae20f03f4 gnu: Reference the inherited inputs values.
This commit was made by running this command:

  sed -e's/modify-inputs (package-\([a-z-]*\)inputs [a-zA-Z0-9-]\+)/modify-inputs \1inputs/g' -i gnu/packages/*.scm

… and then reverting individual hunks where the change would trigger unbound
variable warnings or other issues (such as ‘native-inputs’ is bound in the
body of the ‘inputs’ field, but it refers to the ‘native-inputs’ thunk defined
just above).

Change-Id: I6d94819f2809313fa1fbefc61897502ee7d66fab
2026-03-20 13:27:16 +01:00
Ludovic Courtès
2a50c9598b gnu: Reference the inherited ‘arguments’ value.
This commit was made by running this command:

  sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm

… and then:

  1. reverting changes from ‘gnu/packages/rust.scm’ and
     ‘gnu/packages/java.scm’ since they would incur derivation changes and/or
     breakage;
  2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
  3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
     which use ‘substitute-keyword-arguments’ for arguments that are not
     inherited (and thus ‘arguments’ would be unbound);
  4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
     which make bogus assumptions about inherited arguments.

Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c
2026-03-20 13:27:15 +01:00
Anderson Torres
9e121c3790 gnu: tinycmmc: Update to 0.1.0-1.2e007ba.
* gnu/packages/cmake.scm (tinycmmc): Update to 0.1.0-1.2e007ba.

Change-Id: I519d118028372d0744ac92c7fbdb77135d4af683
Signed-off-by: Andreas Enge <andreas@enge.fr>
2026-02-14 21:33:19 +01:00
Maxim Cournoyer
ede32d8e9c gnu: qmsetup: Update to 1.0.0.0.
* gnu/packages/cmake.scm (qmsetup): Update to 1.0.0.0.

Change-Id: Ie958c93df8b8856f0d257f5b435054fc344f4c76
2026-01-29 14:49:41 +09:00
Nicolas Graves
0b763df3a6 gnu: cmakelang: Switch to pyproject.
* gnu/packages/cmake.scm (cmakelang):
[build-system]: Switch to pyproject-build-system.
[arguments]<#:phases>: Improve phase 'adjust-setup.py.
<#:modules>: Adapt accordingly.
[native-inputs]: Add python-setuptools.

Change-Id: I91ec03b22140c69ea7a9cb39319302585d29398d
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-12-27 21:45:44 +00:00
Greg Hogan
f873ae0cf6 gnu: cmake: Update to 4.1.3.
* gnu/packages/cmake.scm (cmake): Update to 4.1.3.

Change-Id: I05d31c3d527a60bda22d454631a54fa6fad3b3ef
2025-11-28 11:36:59 +00:00
Greg Hogan
201cd120dd gnu: cmake-bootstrap: Update to 3.31.10.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.31.10.

Change-Id: I39fb99903fc96e0afa7d0e297b832c62c9a45787
2025-11-28 11:36:59 +00:00
Yelninei
54202c6b35 gnu: cmake: Reenable some tests on the Hurd.
* gnu/packages/cmake.scm (%common-disabled-tests/hurd): Remove
RunCMake.CompilerChange, RunCMake.file, RunCMake.BundleUtilities,
RunCMake.configure_file and RunCMake.CommandLine

Change-Id: I37a2c60ad97b1323b7e8424c9abb68143db6cebf
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-10-19 12:57:54 +02:00
Yelninei
7e19f9242c gnu: cmake-bootstrap: Remove Hurd-specific phase.
* gnu/packages/cmake.scm (cmake-bootstrap): Remove 'patch-hurd phase.

Change-Id: I52440f9f36045505390c9fe6ff74fc86106af001
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-10-19 12:57:48 +02:00
Yelninei
7265256c3c gnu: cmake: Skip another test on the Hurd.
This is fixed in Cmake v4.0.0, see
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10078

* gnu/packages/cmake.scm (%common-disabled-tests/hurd): Add
RunCMake.RuntimePath.

Change-Id: I188370e98dbb77d1d6771342c46c575b3825b15e
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-10-19 12:57:37 +02:00
Maxim Cournoyer
10482f731e Reapply "Update Maxim's email address."
This reverts commit a7db92d9b3, this time with
the more careful command, to avoid a world rebuild:

grep -rl --exclude-dir=build --exclude-dir=patches --exclude=ld-wrapper.in \
  --exclude=sitecustomize.py --exclude=guix-emacs.el maxim.cournoyer@gmail.com |
  xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'

Change-Id: I0871f5cf9ace79e34e78e24154d0da6ea95a3a91
2025-09-18 13:44:12 +09:00
Maxim Cournoyer
a7db92d9b3 Revert "Update Maxim's email address."
This reverts commit d0d87a744d. Oops! This
caused a world rebuild.

Change-Id: I25fff644b2b61d0ee93d69b457b04c72b5b74d15
2025-09-18 12:07:31 +09:00
Maxim Cournoyer
d0d87a744d Update Maxim's email address.
The change was automated via:

  git grep -l maxim.cournoyer@gmail.com |
    xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'

* .mailmap: New entry.

Change-Id: Iaa88b1e51c94159c49138fb43910badb990eb169
2025-09-18 08:05:19 +09:00
Hilton Chain
141d39db98 gnu: corrosion: Honor CARGO_BUILD_TARGET.
This change integrates Rust cross-compilation support from Guix.

* gnu/packages/patches/corrosion-honor-CARGO_BUILD_TARGET.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/cmake.scm (corrosion)[source]: Apply it.

Change-Id: I319f07f49e390ed84286f35aaa0bd3cad2ad70db
2025-08-21 19:08:29 +08:00
Greg Hogan
c0f03f5b86 gnu: cmake: Switch to pinned version of jsoncpp.
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]:
Replace jsoncpp with jsoncpp/pinned.

Change-Id: I533ce1ec8a974d2f63f1b9ad218ff9ab63514ac8
2025-08-04 04:11:26 +00:00
Greg Hogan
3441c3e30d gnu: cmake: Update to 4.0.3.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.31.8.
[source]: Remove the cmake-curl-certificates-3.24 patch.
[arguments]<#:configure-flags>: Disable debugger.
(cmake-minimal)[arguments]
<#:configure-flags>: Disable debugger.
<#:phases>: Output on failure in 'check phase.
(cmake): Update to 4.0.3.
[source]: Remove the cmake-curl-certificates-3.24 patch.
[inputs]: Add cppdap.
(cmake-3.30): Remove.
(cmake-3.25): New variable.
(%common-build-phases): Substitute for Ninja build.
(%preserved-third-party-files): Add new parser.
* gnu/packages/patches/cmake-curl-certificates-3.24.patch: Delete.
* gnu/local.mk: Remove it.

Change-Id: I8676e80a6cc26242aef4c96360200a1ac646b9fb
2025-08-04 04:11:17 +00:00
Janneke Nieuwenhuizen
8df0a32579 gnu: cmake-bootstrap: Fix build with gcc-14.
Apparently cmake-minimal cannot be updated because of the introducion of a
circular cppdap dependency.

* gnu/packages/cmake.scm (%common-disabled-tests): Add failing "LoadCommand"
and "LoadedCommandOneConfig" tests.

Change-Id: Ic71aa92c327f7853248748d6eab4db9309c90408
2025-07-18 20:17:12 +02:00
Nicolas Graves
277d544909 gnu: tinycmmc: Update to 0.1.0-0.8238a6c.
* gnu/packages/cmake.scm (tinycmmc): Update to 0.1.0-0.8238a6c.

Change-Id: I84d8c90991fc411b93647f117f4701da21d90ef4
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-06-20 15:07:59 +01:00
Morgan Smith
4860c2db7a gnu: emacs-cmake-mode: Use '#:lisp-directory'.
* gnu/packages/cmake.scm (emacs-cmake-mode): Use '#:lisp-directory'.

Change-Id: I09668b4377f524e16d9c3e2696893b3e775f634b
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2025-06-15 16:56:51 +02:00
John Kehayias
e6ea64b7b9 gnu: Add cmake-minimal-3.30.
* gnu/packages/cmake.scm (cmake-minimal-3.30): New variable.

Change-Id: I8cff557e1510ddd183955795ed4119fef50b5385
2025-06-08 15:35:15 -04:00
Maxim Cournoyer
56999614a4 gnu: cmake: Update to 4.0.1.
* gnu/packages/cmake.scm (cmake-3.30): Rename to...
(cmake-next): ... this, and update to 4.0.1.
* gnu/packages/cpp.scm (hyprgraphics): Adjust accordingly.
* gnu/packages/games.scm (gemrb): Likewise.
* gnu/packages/image-viewers.scm (vv): Likewise.
* gnu/packages/machine-learning.scm (fbgemm): Likewise.
* gnu/packages/wm.scm (hyprland): Likewise.
* gnu/packages/xdisorg.scm (aquamarine, hyprlock)
(hyprpaper): Likewise.

Change-Id: Ifb721bc94418696c4894f92aae88028bfb3e8167
2025-04-28 11:46:31 +09:00
Maxim Cournoyer
91cb83ce31 gnu: Add cmakelang.
* gnu/packages/cmake.scm (cmakelang): New variable.

Change-Id: I7f66c178191863922795918b42da8c3abf3b87e2
2025-01-23 21:10:07 +09:00
Efraim Flashner
9e02124778 gnu: corrosion: Update to 0.5.1.
* gnu/packages/cmake.scm (corrosion): Update to 0.5.1.

Change-Id: I0157e20f6d7c380b081fb1a18e5e963d6c0b9b51
2025-01-06 12:21:30 +02:00
Simon South
bdb12d429d gnu: Add sanitizers-cmake.
* gnu/packages/cmake.scm (sanitizers-cmake): New variable.

Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
2024-12-22 12:47:59 +01:00
Charles
8ac0b82e35 gnu: Add corrosion.
* gnu/packages/cmake.scm (corrosion): New variable.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Change-Id: I0bb56889722128b9946af495fab05d39beaaf65a
Signed-off-by: jgart <jgart@dismail.de>
2024-10-20 01:12:54 -05:00
dan
b695fb48d1 gnu: Add cpm-cmake.
* gnu/packages/cmake.scm (cpm-cmake): New variable.

Change-Id: I3938f1da1513010c8af6bedc2aa26635d43ca7ce
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2024-09-26 13:17:54 +09:00
Maxim Cournoyer
e84e762a03 gnu: Add tinycmmc.
* gnu/packages/cmake.scm (tinycmmc): New variable.

Change-Id: Ie3a4e04f1ab3fb3ad6b6825f371d233a4ee905e2
2024-09-22 15:19:51 +09:00
John Kehayias
2db055a4e5 gnu: Add cmake-3.30.
Add newer version of cmake for packages that will need it (for instance, new
features like finding EGL2), without yet updating the default and rebuilding
all cmake packages.

* gnu/packages/cmake.scm (cmake-3.30): New variable.

Change-Id: I345e9cab7a79624ff0012f493c18426bd843e0d6
2024-09-15 20:38:54 -04:00
Maxim Cournoyer
713ac1fe47 gnu: Add qmsetup.
* gnu/packages/cmake.scm (qmsetup): New variable.

Change-Id: Iea83c59498fe7da97a01725a293915669e6714f9
2024-04-03 18:05:12 -04:00
Efraim Flashner
b25b94335a gnu: cmake: Adjust vim plugin directory.
* gnu/packages/cmake.scm (cmake)[arguments]: Add configure-flag to
install vim plugin to the correct directory.

Change-Id: I35909bcdb1c71a19ff76a81087e0b524163da624
2024-02-25 16:20:35 +02:00
Ludovic Courtès
356ca40c89 gnu: cmake-minimal: Remove ‘hidden’ property.
This makes ‘cmake-minimal’ accessible to users and additionally allows
for input rewriting, as discussed
at <https://issues.guix.gnu.org/65665#17>.

* gnu/packages/cmake.scm (cmake-minimal)[properties]: New field.
2023-10-24 00:02:14 +02:00
Janneke Nieuwenhuizen
6f15b4204f gnu: cmake-minimal: Skip tests on the Hurd.
* gnu/packages/cmake.scm (cmake-minimal)[arguments]: When building natively on
the Hurd, add %common-disabled-tests/hurd to skipped tests in phase 'check'.
2023-07-20 10:11:35 +02:00
Janneke Nieuwenhuizen
07eff96a86 gnu: cmake-bootstrap: Fix build for the Hurd.
* gnu/packages/cmake.scm (%common-disabled-tests/hurd): New variable.
(cmake-bootstrap) [inputs]: Include libuv for the Hurd too.
[arguments]: Add %common-disabled-tests/hurd to #:make-flags for the Hurd.
Also add a 'patch-hurd' phase to fix the build.
2023-07-20 10:11:35 +02:00
Janneke Nieuwenhuizen
ff690faf66 gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?.
* gnu/packages/hurd.scm (hurd-target?): Remove.
(hurd-system?): Move to...
* guix/utils.scm (system-hurd?): ...here.
* gnu/packages/*: Update all users, removing (gnu packages hurd) include where
now unused.
2023-06-17 14:38:32 +02:00
Christopher Baines
7df09ee0ab Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
2023-03-02 10:55:08 +00:00
Greg Hogan
0e14096c58 gnu: cmake: Update to 3.25.1.
* gnu/packages/cmake.scm (cmake): Update to 3.25.1.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-01-31 23:28:29 +01:00
Marius Bakke
3cf8b3dc57 gnu: cmake-minimal: Update to 3.24.2.
* gnu/packages/patches/cmake-curl-certificates.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.24.2
[source](patches): Use refreshed patch.
(cmake)[version, source]: Remove.
2022-09-16 22:41:22 +02:00
Maxim Cournoyer
4920f6e634 Merge branch 'staging' into core-updates
Conflicts resolved in:
	gnu/local.mk
	gnu/packages/cmake.scm
	gnu/packages/glib.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/sdl.scm

pango-next, vala-next and librsvg-bootstrap were removed in the process.
2022-09-15 11:43:21 -04:00
Maxim Cournoyer
76454d9af3 gnu: cmake: Update to 3.24.2.
* gnu/packages/cmake.scm (cmake): Update to 3.24.2.
[source]: Adjust snippet to preserve "Utilities/cmelf".  Override with new
patch.
[native-inputs]: Use modify-inputs and remove labels.
* gnu/packages/patches/cmake-curl-certificates-3.24.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-09-14 00:02:39 -04:00
Marius Bakke
d5f69a9fe5 gnu: CMake: Update to 3.24.1.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.24.1.
2022-09-01 23:37:12 +02:00
Marius Bakke
0b0750e831 gnu: CMake: Update to 3.23.2.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.23.2.
(%preserved-third-party-files): Preserve bundled ELF header files.
* gnu/packages/patches/cmake-curl-certificates.patch: Adjust for upstream
changes.
2022-06-27 23:48:01 +02:00
Marius Bakke
b1fa242cb1 gnu: CMake: Use G-expressions.
* gnu/packages/cmake.scm (%common-build-phases): Remove trailing #t's.
(cmake-bootstrap, cmake-minimal, cmake, emacs-cmake-mode)[arguments]: Use
G-expressions.
2022-06-27 23:48:00 +02:00
Marius Bakke
6cd8814011 gnu: CMake: Remove input labels.
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Remove labels.
(cmake)[native-inputs]: Likewise.  Use MODIFY-INPUTS.
2022-06-27 23:48:00 +02:00
Marius Bakke
9dfd2ad73b gnu: CMake: Bootstrap with system jsoncpp.
* gnu/packages/cmake.scm (cmake-bootstrap)[arguments]: Remove
"--no-system-jsoncpp" from #:configure-flags.
[inputs]: Add JSONCPP.
(cmake-minimal)[inputs]: Remove.
2022-06-27 23:48:00 +02:00
Maxime Devos
579270c6bf gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
* gnu/packages/cmake.scm (cmake-bootstrap)[native-search-paths]: Use the
$SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local copy.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-05-13 17:16:04 +02:00
Maxim Cournoyer
eda1860d02 gnu: cmake-bootstrap: Update to 3.21.4.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.21.4.
2022-01-10 11:44:34 -05:00
Ludovic Courtès
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
Maxim Cournoyer
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
Ludovic Courtès
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
Marius Bakke
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