~ruther/guix-local

56999614a45449c4b93c8614540210b609c2b356 — Maxim Cournoyer 1 year, 2 months ago 4e79ec4
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
M gnu/packages/cmake.scm => gnu/packages/cmake.scm +3 -3
@@ 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

M gnu/packages/cpp.scm => gnu/packages/cpp.scm +1 -1
@@ 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

M gnu/packages/games.scm => gnu/packages/games.scm +1 -1
@@ 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))

M gnu/packages/image-viewers.scm => gnu/packages/image-viewers.scm +1 -1
@@ 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"

M gnu/packages/machine-learning.scm => gnu/packages/machine-learning.scm +1 -1
@@ 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

M gnu/packages/wm.scm => gnu/packages/wm.scm +1 -1
@@ 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

M gnu/packages/xdisorg.scm => gnu/packages/xdisorg.scm +3 -3
@@ 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