From ae8437c9c33adcc2ec3d7338f10ee7a4e32c022e Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 15 Mar 2024 00:09:15 +0100 Subject: Set the correct version of cmake required by vcpkg --- private/komodo/cmake.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/private/komodo/cmake.scm b/private/komodo/cmake.scm index 6e1b2b8ca6..3c6f924937 100644 --- a/private/komodo/cmake.scm +++ b/private/komodo/cmake.scm @@ -136,7 +136,10 @@ using the CMake build system.") ;; This test requires 'ldconfig' which is not available in Guix. "RunCMake.install" ;; This test fails for unknown reason. - "RunCMake.file-GET_RUNTIME_DEPENDENCIES")) + "RunCMake.file-GET_RUNTIME_DEPENDENCIES" + + "CMakeLib.testDebuggerNamedPipe-Project" + "CMakeLib.testDebuggerNamedPipe-Script")) (define %common-disabled-tests/hurd '("CTestTestTimeout" @@ -166,7 +169,7 @@ using the CMake build system.") (define-public cmake-bootstrap (package (name "cmake-bootstrap") - (version "3.27.9") + (version "3.27.1") (source (origin (method url-fetch) (uri (string-append "https://cmake.org/files/v" @@ -174,7 +177,7 @@ using the CMake build system.") "/cmake-" version ".tar.gz")) (sha256 (base32 - "13kh930cvljk4fg3ysva196ys29ijzxwy4prfyj5wsiaayc9p6k0")) + "01102g2j5klqxl6jvwhwz45libcg9hnb7xchdr3r86x1bw9v19mi")) (patches (search-patches "cmake-curl-certificates-3.24.patch")))) (build-system gnu-build-system) (arguments @@ -351,7 +354,7 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-minimal) (name "cmake") - (version "3.27.9") + (version "3.27.1") (source (origin (inherit (package-source cmake-minimal)) (method url-fetch) @@ -366,7 +369,7 @@ and workspaces that can be used in the compiler environment of your choice.") ,@rest)))) (sha256 (base32 - "13kh930cvljk4fg3ysva196ys29ijzxwy4prfyj5wsiaayc9p6k0")) + "01102g2j5klqxl6jvwhwz45libcg9hnb7xchdr3r86x1bw9v19mi")) (patches (search-patches "cmake-curl-certificates-3.24.patch")))) (outputs '("out" "doc")) (arguments -- cgit v1.2.3