diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/cmake.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/cmake.scm')
| -rw-r--r-- | gnu/packages/cmake.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 65580c9ff7..df8885b4dd 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2020 Maxim Cournoyer <[email protected]> ;;; Copyright © 2019 Pierre-Moana Levesque <[email protected]> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]> +;;; Copyright © 2021 Ricardo Wurmus <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -334,7 +335,7 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-minimal) (name "cmake") - (version "3.19.2") + (version "3.21.1") ;; TODO: Move the following source field to the cmake-bootstrap package in ;; the next rebuild cycle. (source (origin @@ -344,7 +345,7 @@ and workspaces that can be used in the compiler environment of your choice.") "/cmake-" version ".tar.gz")) (sha256 (base32 - "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73")) + "1m7y9j5lafkrfswsg2vkpx2fz6p6fqpp2pcp2dcz5pylf58r3hzs")) (snippet (match (origin-snippet (package-source cmake-bootstrap)) ((_ _ exp ...) @@ -413,6 +414,8 @@ and workspaces that can be used in the compiler environment of your choice.") (let ((skipped-tests (list ,@%common-disabled-tests ;; This test fails for unknown reason. "RunCMake.file-GET_RUNTIME_DEPENDENCIES" + ;; This test fails for unknown reason. + "ExportImport" ;; This test requires the bundled libuv. "BootstrapTest"))) (if tests? |