From 5873967ce7752d1e33fcdf59f879545c9566a245 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 22 Oct 2024 18:09:30 +0000 Subject: [PATCH] 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 --- 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, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 550877a398311b423c04174f91056b7f99e7f8ed..7ddb0b93ce9641f902e26c7edbfd28275dd96ea2 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 cab9620d958c86e8ea5fc4b3de2f9fb1575e2701..209f05d4570842f6cc4c8502345db0938b9b9477 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4136,7 +4136,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 @@ -4585,7 +4585,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 7f50cb0acd723563192d3570eea94b55ee30157b..55ece1d96f214117655a07d3074583463e9f1849 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 93c70b75d1047e0b7266d87179530574cd65dca0..55525b105204fac5ea33946055168cded3b70ca3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5104,7 +5104,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 @@ -14299,7 +14299,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 6a3676be048a2b120f89c051c892fce9d2f95f49..42aa985ac2479bad760d14e345176c2edd16009e 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -21799,7 +21799,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 ed386371ce8505f92b1a893675614746fb457634..ff063bd368315fe48eeda990bcc202e3b3c2b4fb 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 885e9fc68b7db8fc0aeb845dad75322a3a33ce09..884ed86cceb01352aaa219e11f28a838c0995b91 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 0936c0a14d7e4cdb6de0a25802318f1ea3bbd24d..d0320024647f8623fc7439f71ea4b7fb003486cc 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 4b3ea8ac0b7955d001679a1f1e4d8647f57f1e6d..2e4fa08d5a6ccbb746669fd902852ef7a3be485a 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 673979d1d86118aeaa64e462ab0bc64af0bf8b54..5007c82e6e0d5766c90fed9c9be7b456833b778b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -820,7 +820,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 5276f96fea3eeb49a6f57f3f11c36d25065fa320..67c3c934108724ac286ad80acd192dace1a7bb02 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 3d03ce93c39b930f1266c16422901c3eb8ac2a95..a4b83c3ea8d751a3a9b0caa919342c693145372d 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 b55dfcd7fd7f880510b819bd0c46b5e8d1b632b3..c92ce343c55df92f45180746bbad8bc47e4a4157 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -459,7 +459,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 6770d26ce14250c9eadf0b46c17111c05136dc7f..0bdd576e2311f77c7f91f71fcdcaf6ed042ca39c 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 dfe6a782be295ed1c09bd3f3a1307b44936019a8..dae4719b518b34deb975ec51d246106e6b4a41d4 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 c4051c767298418d9d2aaa302a6e2bf21c1cf282..c7883d1bbccde58561d75827045a03f4fc3b1fb3 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)