diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-09-12 15:02:49 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-09-15 20:38:54 -0400 |
| commit | 2db055a4e56eab134852a16a24443148dc32b5a2 (patch) | |
| tree | f850123e1cc703b33103f5c973efe0d74142dc30 /gnu/packages/cmake.scm | |
| parent | 83698b6fa037aa1f3adc38f474be41bac7622ed8 (diff) | |
gnu: Add cmake-3.30.
Add newer version of cmake for packages that will need it (for instance, new
features like finding EGL2), without yet updating the default and rebuilding
all cmake packages.
* gnu/packages/cmake.scm (cmake-3.30): New variable.
Change-Id: I345e9cab7a79624ff0012f493c18426bd843e0d6
Diffstat (limited to 'gnu/packages/cmake.scm')
| -rw-r--r-- | gnu/packages/cmake.scm | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 0c780fe4201..ac753219376 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> | 12 | ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> |
| 13 | ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> | 13 | ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> |
| 14 | ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> | 14 | ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> |
| 15 | ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> | ||
| 15 | ;;; | 16 | ;;; |
| 16 | ;;; This file is part of GNU Guix. | 17 | ;;; This file is part of GNU Guix. |
| 17 | ;;; | 18 | ;;; |
| @@ -409,6 +410,26 @@ and workspaces that can be used in the compiler environment of your choice.") | |||
| 409 | texinfo))) | 410 | texinfo))) |
| 410 | (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) | 411 | (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) |
| 411 | 412 | ||
| 413 | (define-public cmake-3.30 | ||
| 414 | (package | ||
| 415 | (inherit cmake) | ||
| 416 | (version "3.30.3") | ||
| 417 | (source (origin | ||
| 418 | (method url-fetch) | ||
| 419 | (uri (string-append "https://cmake.org/files/v" | ||
| 420 | (version-major+minor version) | ||
| 421 | "/cmake-" version ".tar.gz")) | ||
| 422 | (sha256 | ||
| 423 | (base32 | ||
| 424 | "1r48zym4dy4mvwzk704zh1vx9gb4a910f424ypvis28mcxdy2pbd")))) | ||
| 425 | (native-inputs | ||
| 426 | (modify-inputs (package-native-inputs cmake) | ||
| 427 | ;; Avoid circular dependency with (gnu packages debug). Note: cppdap | ||
| 428 | ;; is built with cmake, so when the default cmake is updated to this | ||
| 429 | ;; version this circular dependency will need to be worked around. | ||
| 430 | (prepend (module-ref (resolve-interface '(gnu packages debug)) | ||
| 431 | 'cppdap)))))) | ||
| 432 | |||
| 412 | (define-public cmake-minimal-cross | 433 | (define-public cmake-minimal-cross |
| 413 | (package | 434 | (package |
| 414 | (inherit cmake-minimal) | 435 | (inherit cmake-minimal) |
