diff options
| author | Greg Hogan <code@greghogan.com> | 2024-10-22 18:09:30 +0000 |
|---|---|---|
| committer | Greg Hogan <code@greghogan.com> | 2025-08-04 04:10:56 +0000 |
| commit | 5873967ce7752d1e33fcdf59f879545c9566a245 (patch) | |
| tree | edcda4ccd1a72e05e0347ba9766c3bf449e38854 /gnu | |
| parent | 633cb4618658470e8a5c027d620d6e2499ffcdf4 (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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/emulators.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/freedesktop.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/golang-xyz.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/hardware.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/mp3.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/pantheon.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/photo.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/plotutils.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/python-graphics.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/syndication.scm | 2 | ||||
| -rw-r--r-- | 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 550877a3983..7ddb0b93ce9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm | |||
| @@ -7270,8 +7270,6 @@ bases are detected.") | |||
| 7270 | (bin (string-append #$output "/bin/"))) | 7270 | (bin (string-append #$output "/bin/"))) |
| 7271 | (mkdir-p bin) | 7271 | (mkdir-p bin) |
| 7272 | (copy-recursively "." share) | 7272 | (copy-recursively "." share) |
| 7273 | (delete-file (string-append share "/Chrysalis/build/CMakeFiles/CMakeOutput.log")) | ||
| 7274 | (delete-file (string-append share "/Inchworm/build/CMakeFiles/CMakeOutput.log")) | ||
| 7275 | 7273 | ||
| 7276 | (wrap-program (string-append share "Trinity") | 7274 | (wrap-program (string-append share "Trinity") |
| 7277 | `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) | 7275 | `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) |
| @@ -7325,7 +7323,7 @@ bases are detected.") | |||
| 7325 | (list coreutils | 7323 | (list coreutils |
| 7326 | gzip | 7324 | gzip |
| 7327 | which)) | 7325 | which)) |
| 7328 | (native-inputs (list cmake)) | 7326 | (native-inputs (list cmake-minimal)) |
| 7329 | (home-page "https://github.com/trinityrnaseq/trinityrnaseq/wiki") | 7327 | (home-page "https://github.com/trinityrnaseq/trinityrnaseq/wiki") |
| 7330 | (synopsis "Trinity RNA-Seq de novo transcriptome assembly") | 7328 | (synopsis "Trinity RNA-Seq de novo transcriptome assembly") |
| 7331 | (description "Trinity assembles transcript sequences from Illumina RNA-Seq | 7329 | (description "Trinity assembles transcript sequences from Illumina RNA-Seq |
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index cab9620d958..209f05d4570 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm | |||
| @@ -4136,7 +4136,7 @@ graphic filters. Some of its features include: | |||
| 4136 | (("include\\(cmake/") | 4136 | (("include\\(cmake/") |
| 4137 | "include("))))) | 4137 | "include("))))) |
| 4138 | (build-system pyproject-build-system) | 4138 | (build-system pyproject-build-system) |
| 4139 | (native-inputs (list cmake pkg-config python-setuptools python-wheel)) | 4139 | (native-inputs (list cmake-minimal pkg-config python-setuptools python-wheel)) |
| 4140 | (home-page "https://www.unicorn-engine.org") | 4140 | (home-page "https://www.unicorn-engine.org") |
| 4141 | (synopsis "Generic CPU emulator framework") | 4141 | (synopsis "Generic CPU emulator framework") |
| 4142 | (description | 4142 | (description |
| @@ -4585,7 +4585,7 @@ stack-machine, written in ANSI C. Graphical output is implemented using SDL2.") | |||
| 4585 | (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) | 4585 | (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) |
| 4586 | (build-system pyproject-build-system) | 4586 | (build-system pyproject-build-system) |
| 4587 | (native-inputs | 4587 | (native-inputs |
| 4588 | (list cmake | 4588 | (list cmake-minimal |
| 4589 | python-setuptools | 4589 | python-setuptools |
| 4590 | python-wheel)) | 4590 | python-wheel)) |
| 4591 | (home-page "https://www.keystone-engine.org") | 4591 | (home-page "https://www.keystone-engine.org") |
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7f50cb0acd7..55ece1d96f2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm | |||
| @@ -3678,7 +3678,7 @@ supporting behavior like @samp{ssh -X}.") | |||
| 3678 | (base32 | 3678 | (base32 |
| 3679 | "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q")))) | 3679 | "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q")))) |
| 3680 | (build-system meson-build-system) | 3680 | (build-system meson-build-system) |
| 3681 | (native-inputs (list cmake pkg-config)) | 3681 | (native-inputs (list cmake-minimal pkg-config)) |
| 3682 | (inputs (list cairo | 3682 | (inputs (list cairo |
| 3683 | dbus | 3683 | dbus |
| 3684 | egl-wayland | 3684 | egl-wayland |
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 93c70b75d10..55525b10520 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -5104,7 +5104,7 @@ from the GSettings schemas in gsettings-desktop-schemas.") | |||
| 5104 | (native-inputs | 5104 | (native-inputs |
| 5105 | (list gettext-minimal | 5105 | (list gettext-minimal |
| 5106 | pkg-config | 5106 | pkg-config |
| 5107 | cmake | 5107 | cmake-minimal |
| 5108 | `(,glib "bin") | 5108 | `(,glib "bin") |
| 5109 | desktop-file-utils | 5109 | desktop-file-utils |
| 5110 | itstool | 5110 | itstool |
| @@ -14299,7 +14299,7 @@ historical battery usage and related statistics.") | |||
| 14299 | ;; This is done so we can override. | 14299 | ;; This is done so we can override. |
| 14300 | (("`set.PREFIX_BIN") "set(QPREFIX_BIN"))))))) | 14300 | (("`set.PREFIX_BIN") "set(QPREFIX_BIN"))))))) |
| 14301 | (native-inputs | 14301 | (native-inputs |
| 14302 | (list cmake pkg-config intltool gettext-minimal)) | 14302 | (list cmake-minimal pkg-config intltool gettext-minimal)) |
| 14303 | (inputs | 14303 | (inputs |
| 14304 | (list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile | 14304 | (list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile |
| 14305 | shared-mime-info)) | 14305 | shared-mime-info)) |
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 6a3676be048..42aa985ac24 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm | |||
| @@ -21799,7 +21799,7 @@ recognizers) at run time.") | |||
| 21799 | (list | 21799 | (list |
| 21800 | #:import-path "mvdan.cc/editorconfig")) | 21800 | #:import-path "mvdan.cc/editorconfig")) |
| 21801 | (native-inputs | 21801 | (native-inputs |
| 21802 | (list cmake)) | 21802 | (list cmake-minimal)) |
| 21803 | (home-page "https://github.com/mvdan/editorconfig") | 21803 | (home-page "https://github.com/mvdan/editorconfig") |
| 21804 | (synopsis "EditorConfig support in Go") | 21804 | (synopsis "EditorConfig support in Go") |
| 21805 | (description | 21805 | (description |
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ed386371ce8..ff063bd3683 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}.") | |||
| 1519 | (base32 "1cc95ggs64jqq9lk5c8fm4nk6fdnv1x7lr3k4znamj0vv6w22bcd")))) | 1519 | (base32 "1cc95ggs64jqq9lk5c8fm4nk6fdnv1x7lr3k4znamj0vv6w22bcd")))) |
| 1520 | (build-system meson-build-system) | 1520 | (build-system meson-build-system) |
| 1521 | (native-inputs | 1521 | (native-inputs |
| 1522 | (list cmake pkg-config)) | 1522 | (list cmake-minimal pkg-config)) |
| 1523 | (inputs | 1523 | (inputs |
| 1524 | (list avahi libtirpc libxml2)) | 1524 | (list avahi libtirpc libxml2)) |
| 1525 | (home-page "https://lxi-tools.github.io/") | 1525 | (home-page "https://lxi-tools.github.io/") |
| @@ -1559,7 +1559,7 @@ your network, send SCPI commands, and receive responses.") | |||
| 1559 | (("update-desktop-database") (which "true")))))))) | 1559 | (("update-desktop-database") (which "true")))))))) |
| 1560 | (native-inputs | 1560 | (native-inputs |
| 1561 | (list bash-completion | 1561 | (list bash-completion |
| 1562 | cmake | 1562 | cmake-minimal |
| 1563 | (list glib "bin") | 1563 | (list glib "bin") |
| 1564 | pkg-config | 1564 | pkg-config |
| 1565 | python | 1565 | python |
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 885e9fc68b7..884ed86cceb 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm | |||
| @@ -827,7 +827,7 @@ simple to use yet fully featured.") | |||
| 827 | (,(string-append (assoc-ref inputs "gtk+") | 827 | (,(string-append (assoc-ref inputs "gtk+") |
| 828 | "/share/glib-2.0/schemas")))))))))) | 828 | "/share/glib-2.0/schemas")))))))))) |
| 829 | (native-inputs | 829 | (native-inputs |
| 830 | (list pkg-config cmake)) | 830 | (list pkg-config cmake-minimal)) |
| 831 | (inputs | 831 | (inputs |
| 832 | (list glib | 832 | (list glib |
| 833 | gtk+ | 833 | gtk+ |
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0936c0a14d7..d0320024647 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm | |||
| @@ -1607,6 +1607,8 @@ tools_locations = { | |||
| 1607 | (native-inputs | 1607 | (native-inputs |
| 1608 | (list autoconf-wrapper | 1608 | (list autoconf-wrapper |
| 1609 | automake | 1609 | automake |
| 1610 | ;; If cmake is replaced with cmake-minimal then Guix errors when | ||
| 1611 | ;; listing the dependents of rapidjson. | ||
| 1610 | cmake | 1612 | cmake |
| 1611 | git-minimal | 1613 | git-minimal |
| 1612 | libtool | 1614 | libtool |
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 4b3ea8ac0b7..2e4fa08d5a6 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm | |||
| @@ -127,7 +127,7 @@ in apps built for the Pantheon desktop.") | |||
| 127 | libgee | 127 | libgee |
| 128 | libhandy)) | 128 | libhandy)) |
| 129 | (native-inputs | 129 | (native-inputs |
| 130 | (list cmake | 130 | (list cmake-minimal |
| 131 | `(,glib "bin") ; for glib-compile-schemas | 131 | `(,glib "bin") ; for glib-compile-schemas |
| 132 | gettext-minimal | 132 | gettext-minimal |
| 133 | pkg-config | 133 | pkg-config |
| @@ -186,7 +186,7 @@ desktop.") | |||
| 186 | libical | 186 | libical |
| 187 | libportal)) | 187 | libportal)) |
| 188 | (native-inputs | 188 | (native-inputs |
| 189 | (list cmake | 189 | (list cmake-minimal |
| 190 | `(,glib "bin") ; for glib-compile-schemas | 190 | `(,glib "bin") ; for glib-compile-schemas |
| 191 | gettext-minimal | 191 | gettext-minimal |
| 192 | pkg-config | 192 | pkg-config |
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 673979d1d86..5007c82e6e0 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm | |||
| @@ -820,7 +820,7 @@ such as Batch image processing.") | |||
| 820 | `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) | 820 | `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) |
| 821 | `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) | 821 | `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) |
| 822 | (native-inputs | 822 | (native-inputs |
| 823 | (list cmake | 823 | (list cmake-minimal |
| 824 | gettext-minimal | 824 | gettext-minimal |
| 825 | `(,glib "bin") | 825 | `(,glib "bin") |
| 826 | gobject-introspection | 826 | gobject-introspection |
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 5276f96fea3..67c3c934108 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | automake | 90 | automake |
| 91 | bison | 91 | bison |
| 92 | boost | 92 | boost |
| 93 | cmake | 93 | cmake-minimal |
| 94 | emacs-minimal | 94 | emacs-minimal |
| 95 | flex | 95 | flex |
| 96 | ghostscript ;for tests | 96 | ghostscript ;for tests |
diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm index 3d03ce93c39..a4b83c3ea8d 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.") | |||
| 375 | (("\\$\\{SoQt_INCLUDE_DIRS}") | 375 | (("\\$\\{SoQt_INCLUDE_DIRS}") |
| 376 | "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))))))) | 376 | "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))))))) |
| 377 | (native-inputs | 377 | (native-inputs |
| 378 | (list cmake swig)) | 378 | (list cmake-minimal swig)) |
| 379 | (inputs | 379 | (inputs |
| 380 | (list python-wrapper | 380 | (list python-wrapper |
| 381 | qtbase-5 | 381 | qtbase-5 |
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b55dfcd7fd7..c92ce343c55 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.") | |||
| 459 | (("^minimum-version =.*") ""))))))) | 459 | (("^minimum-version =.*") ""))))))) |
| 460 | (propagated-inputs (list python-numpy)) | 460 | (propagated-inputs (list python-numpy)) |
| 461 | (native-inputs | 461 | (native-inputs |
| 462 | (list cmake pybind11 python-pytest python-scikit-build-core)) | 462 | (list cmake-minimal pybind11 python-pytest python-scikit-build-core)) |
| 463 | (home-page "https://github.com/scikit-hep/awkward-1.0") | 463 | (home-page "https://github.com/scikit-hep/awkward-1.0") |
| 464 | (synopsis "CPU kernels and compiled extensions for Awkward Array") | 464 | (synopsis "CPU kernels and compiled extensions for Awkward Array") |
| 465 | (description "Awkward CPP provides precompiled routines for the awkward | 465 | (description "Awkward CPP provides precompiled routines for the awkward |
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6770d26ce14..0bdd576e231 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm | |||
| @@ -5807,7 +5807,7 @@ configurable also via HTTP.") | |||
| 5807 | (build-system cmake-build-system) | 5807 | (build-system cmake-build-system) |
| 5808 | (arguments '(#:tests? #f)) ; There are no tests | 5808 | (arguments '(#:tests? #f)) ; There are no tests |
| 5809 | (native-inputs | 5809 | (native-inputs |
| 5810 | (list pkg-config cmake)) | 5810 | (list pkg-config cmake-minimal)) |
| 5811 | (inputs | 5811 | (inputs |
| 5812 | (list qtbase-5 coin3d)) | 5812 | (list qtbase-5 coin3d)) |
| 5813 | (home-page "https://github.com/coin3d/soqt") | 5813 | (home-page "https://github.com/coin3d/soqt") |
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index dfe6a782be2..dae4719b518 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.") | |||
| 601 | (base32 "1fl362920n6nz4x9wihyzbr82d9cy60sknhmajj62whd5gs49sbw")))) | 601 | (base32 "1fl362920n6nz4x9wihyzbr82d9cy60sknhmajj62whd5gs49sbw")))) |
| 602 | (build-system meson-build-system) | 602 | (build-system meson-build-system) |
| 603 | (inputs (list fmt tidy-html pybind11 python pugixml)) | 603 | (inputs (list fmt tidy-html pybind11 python pugixml)) |
| 604 | (native-inputs (list cmake pkg-config)) ; need cmake to find pybind11 | 604 | (native-inputs (list cmake-minimal pkg-config)) ; need cmake to find pybind11 |
| 605 | (home-page "https://gitlab.com/gabmus/syndication-domination") | 605 | (home-page "https://gitlab.com/gabmus/syndication-domination") |
| 606 | (synopsis "RSS/Atom feed parser") | 606 | (synopsis "RSS/Atom feed parser") |
| 607 | (description "This package provides an experimental RSS/Atom feed | 607 | (description "This package provides an experimental RSS/Atom feed |
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index c4051c76729..c7883d1bbcc 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.") | |||
| 372 | libtool | 372 | libtool |
| 373 | gettext-minimal | 373 | gettext-minimal |
| 374 | font-util | 374 | font-util |
| 375 | cmake | 375 | cmake-minimal |
| 376 | perl))) | 376 | perl))) |
| 377 | (inputs | 377 | (inputs |
| 378 | (modify-inputs (append (package-inputs xorg-server) | 378 | (modify-inputs (append (package-inputs xorg-server) |
