From patchwork Tue Nov 12 05:28:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Vilata i Balaguer X-Patchwork-Id: 16088 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 61E291772E; Tue, 12 Nov 2019 05:30:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 17D4A17727 for ; Tue, 12 Nov 2019 05:30:15 +0000 (GMT) Received: from localhost ([::1]:59258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUOkj-00080p-Dj for patchwork@mira.cbaines.net; Tue, 12 Nov 2019 00:30:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUOkd-00080J-DR for guix-patches@gnu.org; Tue, 12 Nov 2019 00:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUOkc-00058R-78 for guix-patches@gnu.org; Tue, 12 Nov 2019 00:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47447) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUOkc-00057l-2x for guix-patches@gnu.org; Tue, 12 Nov 2019 00:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iUOkb-0004KV-Sd for guix-patches@gnu.org; Tue, 12 Nov 2019 00:30:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38060] [PATCH] gnu: CMake: Update to 3.15.5. Resent-From: Ivan Vilata i Balaguer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2019 05:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 38060@debbugs.gnu.org, Mathieu Othacehe , Ivan Vilata i Balaguer Received: via spool by 38060-submit@debbugs.gnu.org id=B38060.157353655016563 (code B ref 38060); Tue, 12 Nov 2019 05:30:01 +0000 Received: (at 38060) by debbugs.gnu.org; 12 Nov 2019 05:29:10 +0000 Received: from localhost ([127.0.0.1]:56268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUOjm-0004J5-3x for submit@debbugs.gnu.org; Tue, 12 Nov 2019 00:29:10 -0500 Received: from lev.selidor.net ([66.246.138.156]:49975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iUOjk-0004Iy-Fh for 38060@debbugs.gnu.org; Tue, 12 Nov 2019 00:29:09 -0500 Received: from sax.terramar.selidor.net (unknown [IPv6:2600:3c03:e001:114e:949b:a9f2:7d01:abce]) by lev.selidor.net (Postfix) with ESMTP id 2375FCB25; Tue, 12 Nov 2019 05:29:08 +0000 (UTC) Received: by sax.terramar.selidor.net (Postfix, from userid 1000) id E100A9A009E; Tue, 12 Nov 2019 00:28:11 -0500 (EST) Date: Tue, 12 Nov 2019 00:28:11 -0500 From: Ivan Vilata i Balaguer Message-ID: <20191112052811.GR17621@sax.terramar.selidor.net> References: <20191104165746.GJ17621@sax.terramar.selidor.net> <87h83irc8r.fsf@gmail.com> <87eeyfjq11.fsf@devup.no> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87eeyfjq11.fsf@devup.no> User-Agent: Mutt/1.12.2 (2019-09-21) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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, 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 . + (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)