From patchwork Tue Apr 30 14:52:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Ziltener X-Patchwork-Id: 26748 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 C6C0427BBEA; Tue, 30 Apr 2024 15:53:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E507927BBE2 for ; Tue, 30 Apr 2024 15:53:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1orX-00018k-J3; Tue, 30 Apr 2024 10:53:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1orW-00017e-7j for guix-patches@gnu.org; Tue, 30 Apr 2024 10:53:42 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1orV-0005tn-VI for guix-patches@gnu.org; Tue, 30 Apr 2024 10:53:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1orq-0004Su-HD for guix-patches@gnu.org; Tue, 30 Apr 2024 10:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70675] [PATCH] gnu: cmake: Update to 3.29.2. Resent-From: Daniel Ziltener Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 14:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70675@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171448880617155 (code B ref -1); Tue, 30 Apr 2024 14:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2024 14:53:26 +0000 Received: from localhost ([127.0.0.1]:59795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1orF-0004Sd-R7 for submit@debbugs.gnu.org; Tue, 30 Apr 2024 10:53:26 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1orC-0004SS-Pw for submit@debbugs.gnu.org; Tue, 30 Apr 2024 10:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1oqm-0000pl-Gx for guix-patches@gnu.org; Tue, 30 Apr 2024 10:52:56 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199] helo=lyrion.ch) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1oqg-0005nY-HW for guix-patches@gnu.org; Tue, 30 Apr 2024 10:52:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1714488767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJXUQf7wCZzgb0tx//SI18DV5QWZJ8eXOoEq6nYkFck=; b=yEcFfC0jEtiFUQP2Z8fuRdEANsMDepmA6nWWNyqnSljLcxBXoRIyiSbCf4ISGFfFjZcGdv v8zlo2Cjm4mLFrsKUjshFRKTJ4cn5PNWtp7OA453EhiZ6enLAX/4qtBv91rFXZZfe8H2vu TG4CERThJz4LXGMVzD960VxnMFiKHBfjx8jn5lVO1HbpJBpZ3iNXwRrM0PwM6TRkGcwuUa dPOQghYxoIErPYLUUkkiCVFXFE7QCf6VVbhkQ09oJizld01wtZT2faO6cjdxvMXP3axk5X SJw0tohALuXPe0rrLY2DzaOlW7x1/A/2vNCoTbfhWbjRiOzu9NsnJuCPjenl1A== Received: from [IPV6:2a00:1f:99c0:3c01:8fc9:e8ec:45e0:6cde] ( [2a00:1f:99c0:3c01:8fc9:e8ec:45e0:6cde]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 2e71e6b9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Tue, 30 Apr 2024 14:52:47 +0000 (UTC) Message-ID: Date: Tue, 30 Apr 2024 16:52:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US Received-SPF: pass client-ip=195.15.241.199; envelope-from=dziltener@lyrion.ch; helo=lyrion.ch X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Daniel Ziltener X-ACL-Warn: , Daniel Ziltener via Guix-patches X-Patchwork-Original-From: Daniel Ziltener via Guix-patches via From: Daniel Ziltener Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/cmake.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (substitute-keyword-arguments (package-arguments cmake-minimal) @@ -373,10 +366,8 @@ (define-public cmake (if (%current-target-system) cmake-minimal-cross cmake-minimal)) - ;; Enable debugging information for convenience. ((#:build-type _ #f) "RelWithDebInfo") - ((#:configure-flags flags ''()) #~(append (list "-DSPHINX_INFO=ON" "-DSPHINX_MAN=ON" "-DSPHINX_HTML=ON" (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" @@ -401,7 +392,8 @@ (define-public cmake (delete-file-recursively (string-append #$output html))))))))) (inputs (modify-inputs (package-inputs cmake-minimal) - (prepend ncurses))) ;required for ccmake + (prepend ncurses) ;required for ccmake + (prepend cppdap))) ;; Extra inputs required to build the documentation. (native-inputs (modify-inputs (package-native-inputs cmake-minimal) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 0c780fe420..d9cf9851e1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -347,24 +347,17 @@ (define preserved-files ',%preserved-third-party-files) (define-public cmake (package (inherit cmake-minimal) + (version "3.29.2") (name "cmake") - (version "3.25.1") (source (origin - (inherit (package-source cmake-minimal)) - (method url-fetch) - (uri (string-append "https://cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (snippet (match (origin-snippet (package-source cmake-minimal)) - (('begin ('define 'preserved-files ('quote x)) - rest ...) - `(begin (define preserved-files - ',(cons "Utilities/cmelf" x)) - ,@rest)))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.kitware.com/cmake/cmake") + (commit (string-append "v" version)) + (recursive? #t))) (sha256 (base32 - "1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + "0yjk4kqrln8smz457dxansfl69zyikr5015xm23xa4g7x1rihkgg")))) (outputs '("out" "doc")) (arguments