From patchwork Thu Sep 12 19:16:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67895 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 1DA9C27BBEA; Thu, 12 Sep 2024 20:18:14 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 59E5227BBE2 for ; Thu, 12 Sep 2024 20:18:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sopKH-0001H8-CT; Thu, 12 Sep 2024 15:17:57 -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 1sopKF-0001Gy-6M for guix-patches@gnu.org; Thu, 12 Sep 2024 15:17:55 -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 1sopKE-0006U7-TB for guix-patches@gnu.org; Thu, 12 Sep 2024 15:17:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=Abp9O2eMXQ2KYpYld6kBnspKaa6acjR6NaFznIyxVTE=; b=ArYtXVTSEnlg3/gvmO4eH4Eir3RmAl8wrX6+JQVIBMeSO32q+WD/BVFUPY3QSyLotjGDbvy9lvUv0j9nqyBdkWaJYc1Z1BQwkhk2evsyKEd0PwaCqKSa3TfbKhkqCyeFl4HePVuU0ogmgTcwnXWNumuihzxoD2krqedwz2Yo3o7r7aa00MxhQFC4qUroD2+6/GXkW7Keg4eOaVS3YuX/mU97db46bZAjSlywTXXo74YeM5hFQqeWvRjqrR02kW/2T3AqW5FVDh70lGFcwisl0IlutudihSavL8wl4dQI5bGGUmWPpLl/0kgDiv8GrHko+t+fNm3BVfYSHBdWvgxUoQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sopKM-0004JG-0J for guix-patches@gnu.org; Thu, 12 Sep 2024 15:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73209] [PATCH] gnu: Add cmake-3.30. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Sep 2024 19:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73209 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73209@debbugs.gnu.org Cc: John Kehayias X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172616862616470 (code B ref -1); Thu, 12 Sep 2024 19:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Sep 2024 19:17:06 +0000 Received: from localhost ([127.0.0.1]:41961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sopJR-0004Ha-F4 for submit@debbugs.gnu.org; Thu, 12 Sep 2024 15:17:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:45342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sopJO-0004HS-TY for submit@debbugs.gnu.org; Thu, 12 Sep 2024 15:17:04 -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 1sopJF-0001EG-PD for guix-patches@gnu.org; Thu, 12 Sep 2024 15:16:54 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sopJE-0006PG-3R for guix-patches@gnu.org; Thu, 12 Sep 2024 15:16:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726168602; x=1726427802; bh=Abp9O2eMXQ2KYpYld6kBnspKaa6acjR6NaFznIyxVTE=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=WKKPTn+supbNbhcW2qZC8ia1yDWJgLZOT2pnHafKLNiXn6BT3drsMN1mR6CVjYizN xwxOTyyrospHZ99JC6dALfiILx4K88j8QyRc7dSN7i7uZ0DHymSrNpXC9NEfqZc8Wv +oA1z27JhpOQxLL0YrwkOH+pAaCr+cvI/MvsiUcfX3hb6SMth91GYoPWWuQcBeebHA v1p2pyj3CUnCjAHahoQoKrQX682LPeQqTD2PlkmvSUtkgYARbF+ZG5wWK46Hz45aVt 4TG2/RmRWQJkTglc/SB9t2XZaEUggalBv1kET1JGuHsnWjLBVVUITVWbWPIEVO4YKL MRj3CzTm88Svg== Date: Thu, 12 Sep 2024 19:16:35 +0000 Message-ID: <6e22d48a7ef4acc8e8e1a8ce0197e500fe5ae8f1.1726168379.git.john.kehayias@protonmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 28b5449f3b95020ab702e9ff0799143339fe708c MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.16; envelope-from=john.kehayias@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 Hi Guix, Here is a patch to add a new cmake version without updating the default. The only wrinkle was that (at least by default?) there is a new requirement on cppdap which I think makes a circular dependency. I believe this is worked around in the patch, but figured I'd send for review, thanks! Add newer version of cmake for packages that will need it (for instance, new features like finding EGL2), without yet updating the default and rebuilding all cmake packages. * gnu/packages/cmake.scm (cmake-3.30): New variable. Change-Id: I345e9cab7a79624ff0012f493c18426bd843e0d6 --- gnu/packages/cmake.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) base-commit: b2f5a9dd67352e035121c70cfdb34cd440c42e98 -- 2.46.0 diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 0c780fe420..0241594667 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Ricardo Wurmus +;;; Copyright © 2024 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,24 @@ (define-public cmake texinfo))) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) +(define-public cmake-3.30 + (package + (inherit cmake) + (version "3.30.1") + (source (origin + (method url-fetch) + (uri (string-append "https://cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "1qa6ng6083i6iw23srzh9w41z3bxzz7faly2nz0w716fwd9kr6yz")))) + (native-inputs + (modify-inputs (package-native-inputs cmake) + ;; Avoid circular dependency with (gnu packages debug). + (prepend (module-ref (resolve-interface '(gnu packages debug)) + 'cppdap)))))) + (define-public cmake-minimal-cross (package (inherit cmake-minimal)