oom pushed a commit to branch c++-team
in repository guix.
commit c6c121f968e20587826ef3dc1ca4404240fafab0
Author: Greg Hogan <c...@greghogan.com>
AuthorDate: Tue Oct 22 18:09:30 2024 +0000
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/package-management.scm (conan),
* 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
---
gnu/packages/bioinformatics.scm | 4 +---
gnu/packages/emulators.scm | 4 ++--
gnu/packages/freedesktop.scm | 2 +-
gnu/packages/gnome.scm | 4 ++--
gnu/packages/golang-xyz.scm | 2 +-
gnu/packages/hardware.scm | 4 ++--
gnu/packages/mp3.scm | 2 +-
gnu/packages/package-management.scm | 2 +-
gnu/packages/pantheon.scm | 4 ++--
gnu/packages/photo.scm | 2 +-
gnu/packages/plotutils.scm | 2 +-
gnu/packages/python-graphics.scm | 2 +-
gnu/packages/python-xyz.scm | 2 +-
gnu/packages/qt.scm | 2 +-
gnu/packages/syndication.scm | 2 +-
gnu/packages/vnc.scm | 2 +-
16 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index db31955710..7b69b69101 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7262,8 +7262,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")))
@@ -7317,7 +7315,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 d0ac3aa1c7..9f2936c818 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -3860,7 +3860,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
@@ -4297,7 +4297,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 de8fb975bc..43a565da0b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3592,7 +3592,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 5f26c3b347..85082ccc2d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5056,7 +5056,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
@@ -14195,7 +14195,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 gnu-gettext))
+ (list cmake-minimal pkg-config intltool gnu-gettext))
(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 6fefd59f6b..821426d825 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -17440,7 +17440,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 08bdf39043..c36712f225 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1511,7 +1511,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/";)
@@ -1551,7 +1551,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 7bd102a8b8..1b28ccb291 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -818,7 +818,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 28d56add32..3a26b973f2 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1498,7 +1498,7 @@ tools_locations = {
(native-inputs
(list autoconf-wrapper
automake
- cmake
+ cmake-minimal
git-minimal
libtool
meson
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 f8491e99dd..49bb2ed713 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -717,7 +717,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 feec60ca42..2688f2299d 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -89,7 +89,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 c435fa7f78..c519bcdd33 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -480,7 +480,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 36de54cdf1..362629557f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5596,7 +5596,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 61220bb9fe..f2d7751cc7 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)
