[bug#38060] [PATCH] gnu: CMake: Update to 3.15.5.

[bug#38060] [PATCH] gnu: CMake: Update to 3.15.5.

[Ivan Vilata i Balaguer]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

This patch updates CMake to version 3.15.5, which fixes some bugs as listed
here: <https://cmake.org/cmake/help/v3.15/release/3.15.html#updates>

I've been trying the package built from this patch for some days and it seems
to work ok and indeed fix the issues that were affecting us.

Thanks and cheers!

-- 
Ivan Vilata i Balaguer -- https://elvil.net/

[-- Attachment #2: 0001-gnu-CMake-Update-to-3.15.5.patch --]
[-- Type: text/plain, Size: 1149 bytes --]

From 4c0d54331144a6c213d87adc5699d861dd528adc Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Mon, 4 Nov 2019 11:47:13 -0500
Subject: [PATCH] gnu: CMake: Update to 3.15.5.

* gnu/packages/cmake.scm (cmake-minimal): Update to 3.15.5.
---
 gnu/packages/cmake.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 64349be444..7ab50aa336 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -50,7 +50,7 @@
 (define-public cmake-minimal
   (package
     (name "cmake-minimal")
-    (version "3.15.1")
+    (version "3.15.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.cmake.org/files/v"
@@ -58,7 +58,7 @@
                                   "/cmake-" version ".tar.gz"))
               (sha256
                (base32
-                "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq"))
+                "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.23.0

[bug#38060] [PATCH] gnu: CMake: Update to 3.15.5.

[Mathieu Othacehe]

Hello!

> I've been trying the package built from this patch for some days and it seems
> to work ok and indeed fix the issues that were affecting us.

Your patch seems fine. However, I think it will cause a rebuild of all
cmake based packages (even though they are not listed by guix refresh
-l). So I think we need to wait for the next staging cycle.

Marius, is that correct?

Mathieu

[bug#38060] [PATCH] gnu: CMake: Update to 3.15.5.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 644 bytes --]

Mathieu Othacehe <m.othacehe@gmail.com> writes:

> Hello!
>
>> I've been trying the package built from this patch for some days and it seems
>> to work ok and indeed fix the issues that were affecting us.
>
> Your patch seems fine. However, I think it will cause a rebuild of all
> cmake based packages (even though they are not listed by guix refresh
> -l). So I think we need to wait for the next staging cycle.
>
> Marius, is that correct?

Indeed.

Ivan: if you need the newer CMake on 'master', can you submit a patch
that adds a separate 'cmake-3.15.5' variable?  Then you can use that in
cmake-build-system with '#:cmake ,cmake-3.15.5'.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#38060] [PATCH] gnu: CMake: Update to 3.15.5.

[Ivan Vilata i Balaguer]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

Marius Bakke (2019-11-11 00:00:10 +0100) wrote:

> Ivan: if you need the newer CMake on 'master', can you submit a patch
> that adds a separate 'cmake-3.15.5' variable?  Then you can use that in
> cmake-build-system with '#:cmake ,cmake-3.15.5'.

Sure, I'm attaching the patch which I tried and seemed to work (at least for
installing `cmake@3.15.5` explicitly and using it).

Is it ok like this or shall I send it to guix-patches?

Cheers,

-- 
Ivan Vilata i Balaguer -- https://elvil.net/

[-- Attachment #2: 0001-gnu-CMake-Add-version-3.15.5.patch --]
[-- Type: text/plain, Size: 1668 bytes --]

From 2d4fc3d0121ef79cbd0f7f3492536f6475ad51e2 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Mon, 11 Nov 2019 18:53:23 -0500
Subject: [PATCH] gnu: CMake: Add version 3.15.5.

Add CMake version 3.15.5 but do not replace the existing version to avoid
triggering the rebuild of all CMake-based packages.

See <https://issues.guix.gnu.org/issue/38060>.

* gnu/packages/cmake.scm (cmake-3.15.5): Add CMake 3.15.5.
---
 gnu/packages/cmake.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 64349be444..e2c244c1a7 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -219,6 +219,22 @@ and workspaces that can be used in the compiler environment of your choice.")
                (append (search-patches "cmake-curl-certificates.patch")
                        (origin-patches (package-source cmake))))))))
 
+(define-public cmake-3.15.5
+  ;; CMake 3.15.5 fixes some issues, but declare another version to
+  ;; avoid triggering the rebuild of all CMake-based packages.
+  ;; See <https://issues.guix.gnu.org/issue/38060>.
+  (package
+    (inherit cmake)
+    (version "3.15.5")
+    (source (origin
+              (inherit (package-source cmake))
+              (uri (string-append "https://www.cmake.org/files/v"
+                                  (version-major+minor version)
+                                  "/cmake-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))))))
+
 (define-public emacs-cmake-mode
   (package
     (inherit cmake)
-- 
2.23.0

bug#38060: [PATCH] gnu: CMake: Update to 3.15.5.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

Ivan Vilata i Balaguer <ivan@selidor.net> writes:

> Marius Bakke (2019-11-11 00:00:10 +0100) wrote:
>
>> Ivan: if you need the newer CMake on 'master', can you submit a patch
>> that adds a separate 'cmake-3.15.5' variable?  Then you can use that in
>> cmake-build-system with '#:cmake ,cmake-3.15.5'.
>
> Sure, I'm attaching the patch which I tried and seemed to work (at least for
> installing `cmake@3.15.5` explicitly and using it).
>
> Is it ok like this or shall I send it to guix-patches?

Attaching patches to bug reports is fine.  Pushed as
528b52390d216d8a8cd13dfcd1e6e40a6448e6c2.

Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]