From 56999614a45449c4b93c8614540210b609c2b356 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Apr 2025 00:23:21 +0900 Subject: [PATCH] gnu: cmake: Update to 4.0.1. * gnu/packages/cmake.scm (cmake-3.30): Rename to... (cmake-next): ... this, and update to 4.0.1. * gnu/packages/cpp.scm (hyprgraphics): Adjust accordingly. * gnu/packages/games.scm (gemrb): Likewise. * gnu/packages/image-viewers.scm (vv): Likewise. * gnu/packages/machine-learning.scm (fbgemm): Likewise. * gnu/packages/wm.scm (hyprland): Likewise. * gnu/packages/xdisorg.scm (aquamarine, hyprlock) (hyprpaper): Likewise. Change-Id: Ifb721bc94418696c4894f92aae88028bfb3e8167 --- gnu/packages/cmake.scm | 6 +++--- gnu/packages/cpp.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/machine-learning.scm | 2 +- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 1ddcfa4d80..2ce1619bfb 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -419,10 +419,10 @@ and workspaces that can be used in the compiler environment of your choice.") texinfo))) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) -(define-public cmake-3.30 +(define-public cmake-next (package (inherit cmake) - (version "3.30.3") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "https://cmake.org/files/v" @@ -430,7 +430,7 @@ and workspaces that can be used in the compiler environment of your choice.") "/cmake-" version ".tar.gz")) (sha256 (base32 - "1r48zym4dy4mvwzk704zh1vx9gb4a910f424ypvis28mcxdy2pbd")))) + "1q9119wg68vz3ki4g3yw3dkb90zpbr13vy2raar21rb31vhafc6n")))) (native-inputs (modify-inputs (package-native-inputs cmake) ;; Avoid circular dependency with (gnu packages debug). Note: cppdap diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index df839a86cb..d9d1da18e5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -896,7 +896,7 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.") "14yfb8vl1bbldlv12cg3dhd6z9bdaxvlz7kx671dqpi9m8j3kd56")))) (build-system cmake-build-system) (native-inputs (list gcc-14 pkg-config)) - (arguments (list #:cmake cmake-3.30)) + (arguments (list #:cmake cmake-next)) (inputs (list cairo hyprutils libjpeg-turbo diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 187b0b1e71..626438b824 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12802,7 +12802,7 @@ virtual reality devices.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-3.30 + #: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 dba1c6cc4c..4413b93fce 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1281,7 +1281,7 @@ 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-3.30 + #: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 70db9a0979..9e7e08ccae 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4865,7 +4865,7 @@ TensorFlow.js, PyTorch, and MediaPipe.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-3.30 + #:cmake cmake-next #:configure-flags ''("-DFBGEMM_LIBRARY_TYPE=shared") ;; Tests require AVX2 or AVX-512 instructions diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 15ab018183..37dd87a790 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -385,7 +385,7 @@ commands (lock/unlock/before-sleep) and inhibit.") "19ip27hzaj2j2idaz33ypcslawkp9v5vpjx1gcm6ypqsip1s01h1")))) (build-system cmake-build-system) (arguments - (list #:cmake cmake-3.30 + (list #:cmake cmake-next #:tests? #f ;No tests. #:configure-flags #~'("-DNO_HYPRPM=True") #:phases diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index fee7e02d6e..2f52e2ab99 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -257,7 +257,7 @@ command line, without displaying a keyboard at all.") "01lmzmb5bzphichbyim7iy04405af5mqcqf8ki3if4wdxkdmbfn9")))) (build-system cmake-build-system) (arguments - (list #:cmake cmake-3.30 + (list #:cmake cmake-next ;; TODO: Figure out what's expected in the test environment. #:tests? #f)) (native-inputs @@ -3821,7 +3821,7 @@ This package is the fork of hsetroot by Hyriand.") (base32 "03ivr5nsjwiwvpdxpjnldwawy8sx8qgwhs57242xkb0zz0w0gvsk")))) (build-system cmake-build-system) (arguments - `(#:cmake ,cmake-3.30 + `(#:cmake ,cmake-next #:phases (modify-phases %standard-phases ;; remove when fixed @@ -3873,7 +3873,7 @@ GPU-accelerated screen locking utility.") (build-system cmake-build-system) (arguments `(#:tests? #f ;; no test - #:cmake ,cmake-3.30)) + #:cmake ,cmake-next)) (native-inputs (list gcc-14 pkg-config)) (inputs (list cairo