From: Ivan Vilata i Balaguer <ivan@selidor.net>
To: Marius Bakke <mbakke@fastmail.com>
Cc: 38060@debbugs.gnu.org, Mathieu Othacehe <m.othacehe@gmail.com>,
Ivan Vilata i Balaguer <ivan@selidor.net>
Subject: [bug#38060] [PATCH] gnu: CMake: Update to 3.15.5.
Date: Tue, 12 Nov 2019 00:28:11 -0500 [thread overview]
Message-ID: <20191112052811.GR17621@sax.terramar.selidor.net> (raw)
In-Reply-To: <87eeyfjq11.fsf@devup.no>
[-- 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
next prev parent reply other threads:[~2019-11-12 5:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 16:57 [bug#38060] [PATCH] gnu: CMake: Update to 3.15.5 Ivan Vilata i Balaguer
2019-11-05 7:52 ` Mathieu Othacehe
2019-11-10 23:00 ` Marius Bakke
2019-11-12 5:28 ` Ivan Vilata i Balaguer [this message]
2019-11-15 18:17 ` bug#38060: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112052811.GR17621@sax.terramar.selidor.net \
--to=ivan@selidor.net \
--cc=38060@debbugs.gnu.org \
--cc=m.othacehe@gmail.com \
--cc=mbakke@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).