From unknown Tue Jun 17 20:15:52 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#73209 <73209@debbugs.gnu.org> To: bug#73209 <73209@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add cmake-3.30. Reply-To: bug#73209 <73209@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:15:52 +0000 retitle 73209 [PATCH] gnu: Add cmake-3.30. reassign 73209 guix-patches submitter 73209 John Kehayias severity 73209 normal tag 73209 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 12 15:17:05 2024 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 To: guix-patches@gnu.org From: John Kehayias Subject: [PATCH] gnu: Add cmake-3.30. Message-ID: <6e22d48a7ef4acc8e8e1a8ce0197e500fe5ae8f1.1726168379.git.john.kehayias@protonmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 28b5449f3b95020ab702e9ff0799143339fe708c MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: John Kehayias X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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, ne= w features like finding EGL2), without yet updating the default and rebuildin= g 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(+) 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 =C2=A9 2019 Pierre-Moana Levesque ;;; Copyright =C2=A9 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright =C2=A9 2021 Ricardo Wurmus +;;; Copyright =C2=A9 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) base-commit: b2f5a9dd67352e035121c70cfdb34cd440c42e98 -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 15 22:33:29 2024 Received: (at 73209-done) by debbugs.gnu.org; 16 Sep 2024 02:33:29 +0000 Received: from localhost ([127.0.0.1]:50796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sq1YP-0006AB-Ci for submit@debbugs.gnu.org; Sun, 15 Sep 2024 22:33:29 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:24645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sq1YM-00069t-Nz for 73209-done@debbugs.gnu.org; Sun, 15 Sep 2024 22:33:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726453987; x=1726713187; bh=IATv9fF9GjGX5/FumIdIOrwWKsKEFCWytqdsOAoERTw=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=DmnShek6/lKGc4Z5XpH+XGb8vJkeCOyMMwTg0fM23hkYKMyjZGfGrJV4kR5IJQeLu mCMfiYOcW4f9vDtHgrO6hqzbaB5EMF+QDlHHpUE5s3qsq0UpA9sHkWY4rtbhwy3ZOX fak/brQE50o0EH+MIk+ige8FfF9swDiviepSfXJebG2GBSYdMYCfWfs+5f9260CWZQ 6tMXywjrk6xHcJUBsPgw/5Os5beqb0vzLEH0ieECc/XZoSTNEYhnxDUofTWiA7mW76 Wyv4W112A3P7phGn8suKcx4H8NCxNTBBqEg/oxhJZcgyvGSDnlS5TxNmYPADutWwjX jhoungfdTU+bw== Date: Mon, 16 Sep 2024 02:33:02 +0000 To: 73209-done@debbugs.gnu.org From: John Kehayias Subject: Re: [bug#73209] [PATCH] gnu: Add cmake-3.30. Message-ID: <87frq0pbtw.fsf@protonmail.com> In-Reply-To: <6e22d48a7ef4acc8e8e1a8ce0197e500fe5ae8f1.1726168379.git.john.kehayias@protonmail.com> References: <6e22d48a7ef4acc8e8e1a8ce0197e500fe5ae8f1.1726168379.git.john.kehayias@protonmail.com> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: c552aa82afb1bfc182df92e25540db5f42d3aa42 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73209-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Thu, Sep 12, 2024 at 07:16 PM, John Kehayias wrote: > 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! > I ended up pushing as 2db055a4e56eab134852a16a24443148dc32b5a2 after verifying no issues with guix pull locally, updating to latest version (3.30.3), building, and adding a note that since cppdap uses cmake-build-system, we will have to deal with that circular dependency when updating the default cmake. Changes/corrections/etc. welcome. John > > Add newer version of cmake for packages that will need it (for instance, = new > features like finding EGL2), without yet updating the default and rebuild= ing > 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(+) > > 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 =C2=A9 2019 Pierre-Moana Levesque > ;;; Copyright =C2=A9 2020, 2023 Janneke Nieuwenhuizen > ;;; Copyright =C2=A9 2021 Ricardo Wurmus > +;;; Copyright =C2=A9 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) > > base-commit: b2f5a9dd67352e035121c70cfdb34cd440c42e98 > -- > 2.46.0 From unknown Tue Jun 17 20:15:52 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 14 Oct 2024 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator