From b09c302a20d7a108dc55031089e02cd70729b771 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 8 Mar 2025 20:05:32 +0000 Subject: [PATCH] gnu: Use default cmake. * gnu/packages/audio.scm (redumper), * gnu/packages/cpp.scm (hyprgraphics), * gnu/packages/databases.scm (apache-arrow), * gnu/packages/emulators.scm (ares), * gnu/packages/games.scm (gemrb), * gnu/packages/image-viewers.scm (vv), * gnu/packages/machine-learning.scm (fbgemm), * gnu/packages/messaging.scm (libqmatrixclient), * gnu/packages/music.scm (ctrlr), * gnu/packages/video.scm (obs), * gnu/packages/vulkan.scm (glslang), * gnu/packages/wm.scm (hyprland), * gnu/packages/xdisorg.scm (aquamarine, hyprlock, hyprpaper, hyprsunset) [arguments]<#:cmake>: Delete. * gnu/packages/python-compression.scm (python-deflate): [native-inputs]: Replace cmake-next with cmake-minimal. Change-Id: I5b021d7e1e807922425d8f58692b032485603770 --- gnu/packages/audio.scm | 1 - gnu/packages/cpp.scm | 1 - gnu/packages/databases.scm | 1 - gnu/packages/emulators.scm | 1 - gnu/packages/games.scm | 1 - gnu/packages/image-viewers.scm | 1 - gnu/packages/machine-learning.scm | 1 - gnu/packages/messaging.scm | 1 - gnu/packages/music.scm | 1 - gnu/packages/python-compression.scm | 3 +-- gnu/packages/video.scm | 1 - gnu/packages/vulkan.scm | 3 +-- gnu/packages/wm.scm | 3 +-- gnu/packages/xdisorg.scm | 14 ++++---------- 14 files changed, 7 insertions(+), 26 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 45c96a33c5b435250af26f144c84eda9a6c3edb8..fb54c48e724066c898b64204f9208f5a45ef838e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4329,7 +4329,6 @@ using Guix System.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next #:build-type "Release" ;; The build system uses CMake modules features that are only available ;; when using Ninja. diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6d60f42b316872fb953b9dbb72429534ecf1e2b0..0ca58e793935ef2cf8e5092f848afad95c772950 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -928,7 +928,6 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.") "0q7bpywn8ljsj3dymvv19cm7n0r51vg5hj1jsapdl5bwpwf7bf41")))) (build-system cmake-build-system) (native-inputs (list gcc-15 pkg-config)) - (arguments (list #:cmake cmake-next)) (inputs (list cairo hyprutils libjpeg-turbo diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index aa9e5f01d355e177252b6392d885e825f8301fa0..2bfa37ea901813e4b1b53373b98e1256366555ed 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5185,7 +5185,6 @@ with integrated support for finding required rows quickly.") (build-system cmake-build-system) (arguments (list - #:cmake cmake ;needs 3.25+ #:tests? #f #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 209f05d4570842f6cc4c8502345db0938b9b9477..eb196818a6d82681f46b9e9040e269edb41d46c5 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -147,7 +147,6 @@ (build-system cmake-build-system) (arguments (list #:tests? #f ; No tests - #:cmake cmake-next ; Requires cmake >= 3.28 #:configure-flags #~(list "-DARES_BUILD_LOCAL=FALSE" "-DARES_BUILD_OFFICIAL=TRUE" diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dcc31bf622e3d66aa03864f3a75618b0d0889630..35c6feb0d754ec92f122cb5c345865d14eafc55d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -13501,7 +13501,6 @@ virtual reality devices.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next #:configure-flags #~(list "-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL"))) (native-inputs (list python-3.10 glibc-locales googletest)) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8101977f2df0d4efcdad1bd845612493dd4d4176..f594e898d3dd98eedbd65b6a8f1d9bd79890a897 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1292,7 +1292,6 @@ any user may run. Everything is free and privacy is the first concern.") (build-system cmake-build-system) (arguments (list #:tests? #f ; no tests. - #:cmake cmake-next #:configure-flags #~ (list "-DMARCH_NATIVE=OFF" "-DCMAKE_BUILD_TYPE=Release" diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 51e53772cf945e0d68deede4f321504d8c365337..4d8ff4b5e38feb1bdb432cac2d00e082e06b7938 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4819,7 +4819,6 @@ TensorFlow.js, PyTorch, and MediaPipe.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next #:configure-flags ''("-DFBGEMM_LIBRARY_TYPE=shared") ;; Tests require AVX2 or AVX-512 instructions diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 77deb1da269dc426d349a401f070a1b5a71ac963..6f6184240f07c3761ffb210d01ec97ea61e82f26 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2402,7 +2402,6 @@ notifications, and Python scripting support.") (list olm openssl qtkeychain-qt6 qtmultimedia)) (arguments (list #:qtbase qtbase - #:cmake cmake-next #:configure-flags #~(list "-DBUILD_TESTING=ON" "-DBUILD_SHARED_LIBS=ON") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 14c103729999731798ecd0d5546970f79d08dad8..81ad799a91852d5bee84a892784fe75e9bec347a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -627,7 +627,6 @@ playing your music.") (build-system cmake-build-system) (arguments (list - #:cmake cmake ;needs 3.25 #:tests? #false ;there are none #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 683afae03548953beb8a7ed529cd68b51aa8ee71..4361c0b65edae7aa89dd6a7314f8a5f7531330f7 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -835,8 +835,7 @@ wrapper. It provides a backport of the @code{Path} object.") (lambda _ (setenv "LIBDEFLATE_PREFIX" #$(this-package-input "libdeflate"))))))) - ;; CMake >= 3.26 required. - (native-inputs (list cmake-next python-pytest python-scikit-build-core)) + (native-inputs (list cmake-minimal python-pytest python-scikit-build-core)) (inputs (list libdeflate)) (home-page "https://github.com/dcwatson/deflate") (synopsis "Python wrapper for @code{libdeflate}") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5cda7f1eeafe08edc16f1c856775f7941f67b87a..b42f45d727ff1db0bce45f29aa0daeffd8bbe4b6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4151,7 +4151,6 @@ be used for realtime video capture via Linux-specific APIs.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next ;needs cmake >= 3.28 #:tests? #f #:configure-flags #~(let ((libdir (string-append (assoc-ref %outputs "out") "/lib"))) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2f609c787c41aa9e61b999fb6894ae7e6f4c701c..53e6e9d4b1dd86c97e9e86fae238af0b208dd710 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -225,8 +225,7 @@ translation between LLVM IR and SPIR-V.") (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:cmake ,cmake-minimal-3.30 - #:configure-flags '("-DBUILD_SHARED_LIBS=ON" + `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON" ,@(if (target-riscv64?) `("-DCMAKE_EXE_LINKER_FLAGS=-latomic") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52642760e0a32ca869af91c2a390100932656e95..92f86c25f892291f68537ba47f3a756b1994f367 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -393,8 +393,7 @@ loginctl commands (lock/unlock/before-sleep) and inhibit.") "0mn97wlzc5ccywbq87ka7a27jajkdkgypkfzkcan014viph80wif")))) (build-system cmake-build-system) (arguments - (list #:cmake cmake-next - #:tests? #f ;No tests. + (list #:tests? #f ;No tests. #:configure-flags #~'("-DNO_HYPRPM=True") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7737aed2b1813ee36289dd6c8976bafb206550c6..dcf0ce6f93f85aaf3a18fe9a380137caceac413a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -261,8 +261,7 @@ command line, without displaying a keyboard at all.") "0cwbd9cdbg40frhircwfbaxdqh11s8jqq9dqy228j9zvb27y2b72")))) (build-system cmake-build-system) (arguments - (list #:cmake cmake-next - ;; TODO: Figure out what's expected in the test environment. + (list ;; TODO: Figure out what's expected in the test environment. #:tests? #f)) (native-inputs (list gcc-15 hyprwayland-scanner pkg-config)) @@ -3944,9 +3943,7 @@ This package is the fork of hsetroot by Hyriand.") (base32 "0h0iibncjl780nnwvf1mfmqckdzzc4b4fphflj4mq56nswf697ha")))) (build-system cmake-build-system) (arguments - (list - #:cmake cmake-next - #:tests? #f)) ;No tests. + (list #:tests? #f)) ;No tests. (native-inputs (list gcc-15 pkg-config)) @@ -3984,8 +3981,7 @@ reduce percieved brightness below the monitor's minimum.") (base32 "1f0vcp0c9d3m9v3avajprpv14khnv3wk3y9fi3pcwr5xf2alaxv2")))) (build-system cmake-build-system) (arguments - `(#:cmake ,cmake-next - #:phases + `(#:phases (modify-phases %standard-phases ;; remove when fixed (add-after 'unpack 'fixgldiscover @@ -4034,9 +4030,7 @@ GPU-accelerated screen locking utility.") (base32 "0j3hbqfx40cjxkvaiqzfij8pgblg2hyv9lbbjjh4iahciwgh7623")))) (build-system cmake-build-system) - (arguments - `(#:tests? #f ;; no test - #:cmake ,cmake-next)) + (arguments '(#:tests? #f)) ;; no test (native-inputs (list gcc-14 pkg-config)) (inputs (list cairo