summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hogan <code@greghogan.com>2024-10-22 18:09:30 +0000
committerGreg Hogan <code@greghogan.com>2025-07-30 16:28:17 +0000
commit878bf4734bf3a0838c4af0263de910e03adefe60 (patch)
tree5930436c8c4465299b25a68f016b296e4e6e8a04
parent2edecbe4f5fc28ba0d47eebf2978cea9c050241a (diff)
gnu: Pin CMake dependency.
* gnu/packages/emulators.scm (python-keystone-engine, unicorn), * gnu/packages/freedesktop.scm (libdecor), * gnu/packages/gnome.scm (raider, xffm+), * gnu/packages/golang-xyz.scm (go-mvdan-cc-editorconfig), * gnu/packages/hardware.scm (liblxi, lxi-tools), * gnu/packages/mp3.scm (wavbreaker), * gnu/packages/pantheon.scm (pantheon-calculator, pantheon-calendar), * gnu/packages/plotutils.scm (asymptote), * gnu/packages/photo.scm (entangle), * gnu/packages/python-graphics.scm (python-pivy), * gnu/packages/python-xyz.scm (python-awkward-cpp, python-contourpy, python-symengine), * gnu/packages/syndication.scm (syndication-domination) * gnu/packages/qt.scm (soqt), * gnu/packages/vnc.scm (tigervnc-server) [native-inputs]: Change cmake to cmake-minimal. * gnu/packages/bioinformatics.scm (trinityrnaseq) [native-inputs]: Change cmake to cmake-minimal. [arguments]<#:phases>[install]: Remove deletion of uncreated files. Change-Id: I6ce8b737d9a21f83caad7b79b591e68a86f45fd0
-rw-r--r--gnu/packages/bioinformatics.scm4
-rw-r--r--gnu/packages/emulators.scm4
-rw-r--r--gnu/packages/freedesktop.scm2
-rw-r--r--gnu/packages/gnome.scm4
-rw-r--r--gnu/packages/golang-xyz.scm2
-rw-r--r--gnu/packages/hardware.scm4
-rw-r--r--gnu/packages/mp3.scm2
-rw-r--r--gnu/packages/package-management.scm2
-rw-r--r--gnu/packages/pantheon.scm4
-rw-r--r--gnu/packages/photo.scm2
-rw-r--r--gnu/packages/plotutils.scm2
-rw-r--r--gnu/packages/python-graphics.scm2
-rw-r--r--gnu/packages/python-xyz.scm2
-rw-r--r--gnu/packages/qt.scm2
-rw-r--r--gnu/packages/syndication.scm2
-rw-r--r--gnu/packages/vnc.scm2
16 files changed, 21 insertions, 21 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index f3d2926b84..184e43ffcb 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7270,8 +7270,6 @@ bases are detected.")
(bin (string-append #$output "/bin/")))
(mkdir-p bin)
(copy-recursively "." share)
- (delete-file (string-append share "/Chrysalis/build/CMakeFiles/CMakeOutput.log"))
- (delete-file (string-append share "/Inchworm/build/CMakeFiles/CMakeOutput.log"))
(wrap-program (string-append share "Trinity")
`("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE")))
@@ -7325,7 +7323,7 @@ bases are detected.")
(list coreutils
gzip
which))
- (native-inputs (list cmake))
+ (native-inputs (list cmake-minimal))
(home-page "https://github.com/trinityrnaseq/trinityrnaseq/wiki")
(synopsis "Trinity RNA-Seq de novo transcriptome assembly")
(description "Trinity assembles transcript sequences from Illumina RNA-Seq
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index bb608d37cb..a8c2fad0cf 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -3932,7 +3932,7 @@ graphic filters. Some of its features include:
(("include\\(cmake/")
"include(")))))
(build-system pyproject-build-system)
- (native-inputs (list cmake pkg-config python-setuptools python-wheel))
+ (native-inputs (list cmake-minimal pkg-config python-setuptools python-wheel))
(home-page "https://www.unicorn-engine.org")
(synopsis "Generic CPU emulator framework")
(description
@@ -4381,7 +4381,7 @@ stack-machine, written in ANSI C. Graphical output is implemented using SDL2.")
(base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"))))
(build-system pyproject-build-system)
(native-inputs
- (list cmake
+ (list cmake-minimal
python-setuptools
python-wheel))
(home-page "https://www.keystone-engine.org")
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7f50cb0acd..55ece1d96f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3678,7 +3678,7 @@ supporting behavior like @samp{ssh -X}.")
(base32
"05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q"))))
(build-system meson-build-system)
- (native-inputs (list cmake pkg-config))
+ (native-inputs (list cmake-minimal pkg-config))
(inputs (list cairo
dbus
egl-wayland
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 260eef38fe..0a20d83e83 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5097,7 +5097,7 @@ from the GSettings schemas in gsettings-desktop-schemas.")
(native-inputs
(list gettext-minimal
pkg-config
- cmake
+ cmake-minimal
`(,glib "bin")
desktop-file-utils
itstool
@@ -14291,7 +14291,7 @@ historical battery usage and related statistics.")
;; This is done so we can override.
(("`set.PREFIX_BIN") "set(QPREFIX_BIN")))))))
(native-inputs
- (list cmake pkg-config intltool gettext-minimal))
+ (list cmake-minimal pkg-config intltool gettext-minimal))
(inputs
(list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile
shared-mime-info))
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 4331ae6339..5978f1cef4 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -21717,7 +21717,7 @@ recognizers) at run time.")
(list
#:import-path "mvdan.cc/editorconfig"))
(native-inputs
- (list cmake))
+ (list cmake-minimal))
(home-page "https://github.com/mvdan/editorconfig")
(synopsis "EditorConfig support in Go")
(description
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index ed386371ce..ff063bd368 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1519,7 +1519,7 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.")
(base32 "1cc95ggs64jqq9lk5c8fm4nk6fdnv1x7lr3k4znamj0vv6w22bcd"))))
(build-system meson-build-system)
(native-inputs
- (list cmake pkg-config))
+ (list cmake-minimal pkg-config))
(inputs
(list avahi libtirpc libxml2))
(home-page "https://lxi-tools.github.io/")
@@ -1559,7 +1559,7 @@ your network, send SCPI commands, and receive responses.")
(("update-desktop-database") (which "true"))))))))
(native-inputs
(list bash-completion
- cmake
+ cmake-minimal
(list glib "bin")
pkg-config
python
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 885e9fc68b..884ed86cce 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -827,7 +827,7 @@ simple to use yet fully featured.")
(,(string-append (assoc-ref inputs "gtk+")
"/share/glib-2.0/schemas"))))))))))
(native-inputs
- (list pkg-config cmake))
+ (list pkg-config cmake-minimal))
(inputs
(list glib
gtk+
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 0936c0a14d..d032002464 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1607,6 +1607,8 @@ tools_locations = {
(native-inputs
(list autoconf-wrapper
automake
+ ;; If cmake is replaced with cmake-minimal then Guix errors when
+ ;; listing the dependents of rapidjson.
cmake
git-minimal
libtool
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 4b3ea8ac0b..2e4fa08d5a 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -127,7 +127,7 @@ in apps built for the Pantheon desktop.")
libgee
libhandy))
(native-inputs
- (list cmake
+ (list cmake-minimal
`(,glib "bin") ; for glib-compile-schemas
gettext-minimal
pkg-config
@@ -186,7 +186,7 @@ desktop.")
libical
libportal))
(native-inputs
- (list cmake
+ (list cmake-minimal
`(,glib "bin") ; for glib-compile-schemas
gettext-minimal
pkg-config
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 920ae37a78..6a4309a1d7 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -818,7 +818,7 @@ such as Batch image processing.")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
(native-inputs
- (list cmake
+ (list cmake-minimal
gettext-minimal
`(,glib "bin")
gobject-introspection
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 5276f96fea..67c3c93410 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -90,7 +90,7 @@
automake
bison
boost
- cmake
+ cmake-minimal
emacs-minimal
flex
ghostscript ;for tests
diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index 3d03ce93c3..a4b83c3ea8 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -375,7 +375,7 @@ Design spec without sacrificing ease of use or application performance.")
(("\\$\\{SoQt_INCLUDE_DIRS}")
"${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
(native-inputs
- (list cmake swig))
+ (list cmake-minimal swig))
(inputs
(list python-wrapper
qtbase-5
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b9424c620f..234d6f8e97 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -458,7 +458,7 @@ compare against a vast section of other version formats.")
(("^minimum-version =.*") "")))))))
(propagated-inputs (list python-numpy))
(native-inputs
- (list cmake pybind11 python-pytest python-scikit-build-core))
+ (list cmake-minimal pybind11 python-pytest python-scikit-build-core))
(home-page "https://github.com/scikit-hep/awkward-1.0")
(synopsis "CPU kernels and compiled extensions for Awkward Array")
(description "Awkward CPP provides precompiled routines for the awkward
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6770d26ce1..0bdd576e23 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5807,7 +5807,7 @@ configurable also via HTTP.")
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ; There are no tests
(native-inputs
- (list pkg-config cmake))
+ (list pkg-config cmake-minimal))
(inputs
(list qtbase-5 coin3d))
(home-page "https://github.com/coin3d/soqt")
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index dfe6a782be..dae4719b51 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -601,7 +601,7 @@ to create RSS feeds for websites that don't provide any.")
(base32 "1fl362920n6nz4x9wihyzbr82d9cy60sknhmajj62whd5gs49sbw"))))
(build-system meson-build-system)
(inputs (list fmt tidy-html pybind11 python pugixml))
- (native-inputs (list cmake pkg-config)) ; need cmake to find pybind11
+ (native-inputs (list cmake-minimal pkg-config)) ; need cmake to find pybind11
(home-page "https://gitlab.com/gabmus/syndication-domination")
(synopsis "RSS/Atom feed parser")
(description "This package provides an experimental RSS/Atom feed
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index c4051c7672..c7883d1bbc 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -372,7 +372,7 @@ used to connect to VNC servers such as the tigervnc-server package.")
libtool
gettext-minimal
font-util
- cmake
+ cmake-minimal
perl)))
(inputs
(modify-inputs (append (package-inputs xorg-server)