From unknown Sat Aug 16 19:18:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64763] [PATCH] gnu: commencement: Use system in %final-inputs. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jul 2023 10:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64763 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64763@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16899343235121 (code B ref -1); Fri, 21 Jul 2023 10:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jul 2023 10:12:03 +0000 Received: from localhost ([127.0.0.1]:60567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMn7C-0001K4-MD for submit@debbugs.gnu.org; Fri, 21 Jul 2023 06:12:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMn78-0001JS-IE for submit@debbugs.gnu.org; Fri, 21 Jul 2023 06:12:02 -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 1qMn70-0007wD-KN for guix-patches@gnu.org; Fri, 21 Jul 2023 06:11:51 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMn6y-0003st-Mp for guix-patches@gnu.org; Fri, 21 Jul 2023 06:11:50 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 5010727BBE2 for ; Fri, 21 Jul 2023 11:11:46 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ed6cf816 for ; Fri, 21 Jul 2023 10:11:46 +0000 (UTC) From: Christopher Baines Date: Fri, 21 Jul 2023 11:11:45 +0100 Message-ID: <3e0a5d1957c35a9925aab5600ee02b923584a599.1689934305.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) Otherwise this causes odd issues, I presume arising from when %current-system differs from the system argument passed to %final-inputs. * gnu/packages/commencement.scm (%final-inputs): Set %current-system to system. --- gnu/packages/commencement.scm | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fe6f025257..e522e70444 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3459,31 +3459,32 @@ (define-public %final-inputs ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are ;; used for origins that have patches, thereby avoiding circular ;; dependencies. - (let ((finalize (compose with-boot6 - package-with-bootstrap-guile))) - `(,@(map (match-lambda - ((name package) - (list name (finalize package)))) - `(("tar" ,tar) - ("gzip" ,gzip) - ("bzip2" ,bzip2) - ("file" ,file) - ("diffutils" ,diffutils) - ("patch" ,patch) - ("findutils" ,findutils) - ("gawk" ,gawk))) - ("sed" ,sed-final) - ("grep" ,grep-final) - ("xz" ,xz-final) - ("coreutils" ,coreutils-final) - ("make" ,gnu-make-final) - ("bash" ,bash-final) - ("ld-wrapper" ,ld-wrapper) - ("binutils" ,binutils-final) - ("gcc" ,gcc-final) - ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("locales" ,glibc-utf8-locales-final))))) + (parameterize ((%current-system system)) + (let ((finalize (compose with-boot6 + package-with-bootstrap-guile))) + `(,@(map (match-lambda + ((name package) + (list name (finalize package)))) + `(("tar" ,tar) + ("gzip" ,gzip) + ("bzip2" ,bzip2) + ("file" ,file) + ("diffutils" ,diffutils) + ("patch" ,patch) + ("findutils" ,findutils) + ("gawk" ,gawk))) + ("sed" ,sed-final) + ("grep" ,grep-final) + ("xz" ,xz-final) + ("coreutils" ,coreutils-final) + ("make" ,gnu-make-final) + ("bash" ,bash-final) + ("ld-wrapper" ,ld-wrapper) + ("binutils" ,binutils-final) + ("gcc" ,gcc-final) + ("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ("locales" ,glibc-utf8-locales-final)))))) (define-public canonical-package (let ((name->package (mlambda (system) base-commit: 120f1721b2b66e5c9507556267bbfd83945958ce prerequisite-patch-id: 9576d8ce545492d52fbe016d30103a51a9ddf94f -- 2.41.0 From unknown Sat Aug 16 19:18:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64763] [PATCH] gnu: commencement: Use system in %final-inputs. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 15:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64763 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: Josselin Poiret , 64763@debbugs.gnu.org Received: via spool by 64763-submit@debbugs.gnu.org id=B64763.1691420557910 (code B ref 64763); Mon, 07 Aug 2023 15:03:02 +0000 Received: (at 64763) by debbugs.gnu.org; 7 Aug 2023 15:02:37 +0000 Received: from localhost ([127.0.0.1]:34096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT1kj-0000Ec-4H for submit@debbugs.gnu.org; Mon, 07 Aug 2023 11:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT1kd-0000EM-VL for 64763@debbugs.gnu.org; Mon, 07 Aug 2023 11:02:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qT1kY-0007TV-FN; Mon, 07 Aug 2023 11:02:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=W33LtWnjbBMKvO/codCH18RAN5o0QRkw430UwhajCb8=; b=M1o3Qq+qho283lnC3fnZ kMbSEqTok46Z3H5nmbIzTDpLATir+fAPekCGDmEtnLv14BxqkxzRJtDG0UmWpPHAV3/OVPDZfj/K1 b/DUUwjyHJ7FnuIzI7uFqcavYnsf4KLTQeRcVFGd9Ifj47F0adpJdrVua9YAnTj83HtQSoSelK9x/ D4n7+cZ0P0Ji+lIQPYm3kOtU69QwwXGQO8Nc5EVSukwQPnyTw0/kiXbJXJUa56b/fHuPZmGeQCbRL Dv9L4CDf1l3gjz+L9lunn82Z1LYKGXsDhXF8QRvu1Bj7q/t2+xp29uyAHDPUEsPrq39N6XR2/ig7r 8nheYaNhz3K3Qw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <3e0a5d1957c35a9925aab5600ee02b923584a599.1689934305.git.mail@cbaines.net> Date: Mon, 07 Aug 2023 17:02:24 +0200 In-Reply-To: <3e0a5d1957c35a9925aab5600ee02b923584a599.1689934305.git.mail@cbaines.net> (Christopher Baines's message of "Fri, 21 Jul 2023 11:11:45 +0100") Message-ID: <87h6pasxof.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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: -3.3 (---) Hi! Christopher Baines skribis: > Otherwise this causes odd issues, I presume arising from when %current-sy= stem > differs from the system argument passed to %final-inputs. > > * gnu/packages/commencement.scm (%final-inputs): Set %current-system to > system. Please add a =E2=80=9CFixes =E2=80=A6=E2=80=9D line in the log. > gnu/packages/commencement.scm | 51 ++++++++++++++++++----------------- > 1 file changed, 26 insertions(+), 25 deletions(-) > > diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm > index fe6f025257..e522e70444 100644 > --- a/gnu/packages/commencement.scm > +++ b/gnu/packages/commencement.scm > @@ -3459,31 +3459,32 @@ (define-public %final-inputs [...] > + (parameterize ((%current-system system)) LGTM! I think that was definitely the intent of 0dd293b4d9095137c9952e16ca951f887b7e7018 (Cc=E2=80=99ing Josselin just in case). Thanks, Ludo=E2=80=99. PS: I believe the reason we cannot just write: (define/system-dependent %final-inputs =E2=80=A6) is because we have two places where we do: (module-ref m '%final-inputs) which wouldn=E2=80=99t work if =E2=80=98%final-inputs=E2=80=99 were a m= acro, as is the case with =E2=80=98define/system-dependent=E2=80=99. From unknown Sat Aug 16 19:18:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64763] [PATCH] gnu: commencement: Use system in %final-inputs. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Aug 2023 07:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64763 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines Cc: Josselin Poiret , 64763@debbugs.gnu.org Received: via spool by 64763-submit@debbugs.gnu.org id=B64763.169156676228028 (code B ref 64763); Wed, 09 Aug 2023 07:40:01 +0000 Received: (at 64763) by debbugs.gnu.org; 9 Aug 2023 07:39:22 +0000 Received: from localhost ([127.0.0.1]:38173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTdms-0007Hz-22 for submit@debbugs.gnu.org; Wed, 09 Aug 2023 03:39:22 -0400 Received: from jpoiret.xyz ([206.189.101.64]:49040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTdmq-0007Ho-Ah for 64763@debbugs.gnu.org; Wed, 09 Aug 2023 03:39:21 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id E55A5184D6B; Wed, 9 Aug 2023 07:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1691566758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hMu0gFif0yWfiOPcUW7S9JLTV1WeLXrA6LEw2DCfzUI=; b=uW0ziXCF/8Q+FdSm4khxELgZnsA3KtIJOAzoz/rwfmeZ2h0chLeHNOVw00zPR+yafmKe7a oFFtsrUooY0Ae8bs3RPGz8e0liJdJWgAc1gl1qK2fe4qOdYzFrZRdakZBXHYlcdTUYOj26 aGzjSlkuCoVFGp7McXjbnDMgtBAlXsEzwLKNAQTjWzjc2xtTbHVgYdzmUx/fWuxmAxyOzV +ooMaF0TwWlaNatIGsdrywLAYo1XLMLMFsx7LKyvHkIBaeZV3HbnAqYi97JBkDgSUP45ap tG3l3F4CnoWfbhRnpkQ1qDtr8GhuFEuQlj/B/VVWtGJxYL0YU++e6pwl3EJJRg== From: Josselin Poiret Date: Wed, 9 Aug 2023 09:38:31 +0200 Message-ID: In-Reply-To: <87h6pasxof.fsf@gnu.org> References: <87h6pasxof.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: **** X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: -0.0 (/) 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 (-) From: Christopher Baines Otherwise this causes odd issues, I presume arising from when %current-system differs from the system argument passed to %final-inputs. * gnu/packages/commencement.scm (%final-inputs): Set %current-system to system. * gnu/packages/base.scm (%final-inputs): Add optional system parameter. * gnu/ci.scm (base-packages): New procedure to memoize the base packages depending on system. (package->job): Pass system to base-packages. Co-authored-by: Josselin Poiret Signed-off-by: Josselin Poiret --- Hi everyone, I think the patch itself looks good but it will probably be missing some additional stuff for CI, see the modified patch here. Best, gnu/ci.scm | 46 ++++++++++++++++--------------- gnu/packages/base.scm | 7 ++--- gnu/packages/commencement.scm | 51 ++++++++++++++++++----------------- 3 files changed, 55 insertions(+), 49 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index 7acd88ed29..df98c8af97 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -24,6 +24,7 @@ (define-module (gnu ci) #:use-module (guix build-system channel) #:use-module (guix config) #:autoload (guix describe) (package-channels) + #:use-module (guix memoization) #:use-module (guix store) #:use-module (guix profiles) #:use-module (guix packages) @@ -342,29 +343,32 @@ (define job-name ;; Return the name of a package's job. package-name) +(define base-packages + (mlambda (system) + "Return the set of packages considered to be part of the base for SYSTEM." + (delete-duplicates + (append-map (match-lambda + ((_ package _ ...) + (match (package-transitive-inputs package) + (((_ inputs _ ...) ...) + inputs)))) + (%final-inputs system))))) + (define package->job - (let ((base-packages - (delete-duplicates - (append-map (match-lambda - ((_ package _ ...) - (match (package-transitive-inputs package) - (((_ inputs _ ...) ...) - inputs)))) - (%final-inputs))))) - (lambda* (store package system #:key (suffix "")) - "Return a job for PACKAGE on SYSTEM, or #f if this combination is not + (lambda* (store package system #:key (suffix "")) + "Return a job for PACKAGE on SYSTEM, or #f if this combination is not valid. Append SUFFIX to the job name." - (cond ((member package base-packages) - (package-job store (string-append "base." (job-name package)) - package system #:suffix suffix)) - ((supported-package? package system) - (let ((drv (package-derivation store package system - #:graft? #f))) - (and (substitutable-derivation? drv) - (package-job store (job-name package) - package system #:suffix suffix)))) - (else - #f))))) + (cond ((member package (base-packages system)) + (package-job store (string-append "base." (job-name package)) + package system #:suffix suffix)) + ((supported-package? package system) + (let ((drv (package-derivation store package system + #:graft? #f))) + (and (substitutable-derivation? drv) + (package-job store (job-name package) + package system #:suffix suffix)))) + (else + #f)))) (define %x86-64-micro-architectures ;; Micro-architectures for which we build tuned variants. diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1fdfaf8a57..32bc69e2c4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -78,7 +78,8 @@ (define-module (gnu packages base) #:export (glibc libc-for-target make-ld-wrapper - libiconv-if-needed)) + libiconv-if-needed + %final-inputs)) ;;; Commentary: ;;; @@ -1648,10 +1649,10 @@ (define-public (canonical-package package) (proc (module-ref iface 'canonical-package))) (proc package))) -(define-public (%final-inputs) +(define* (%final-inputs #:optional (system (%current-system))) "Return the list of \"final inputs\"." ;; Avoid circular dependency by lazily resolving 'commencement'. (let ((iface (resolve-interface '(gnu packages commencement)))) - ((module-ref iface '%final-inputs) (%current-system)))) + ((module-ref iface '%final-inputs) system))) ;;; base.scm ends here diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fe6f025257..e522e70444 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3459,31 +3459,32 @@ (define-public %final-inputs ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are ;; used for origins that have patches, thereby avoiding circular ;; dependencies. - (let ((finalize (compose with-boot6 - package-with-bootstrap-guile))) - `(,@(map (match-lambda - ((name package) - (list name (finalize package)))) - `(("tar" ,tar) - ("gzip" ,gzip) - ("bzip2" ,bzip2) - ("file" ,file) - ("diffutils" ,diffutils) - ("patch" ,patch) - ("findutils" ,findutils) - ("gawk" ,gawk))) - ("sed" ,sed-final) - ("grep" ,grep-final) - ("xz" ,xz-final) - ("coreutils" ,coreutils-final) - ("make" ,gnu-make-final) - ("bash" ,bash-final) - ("ld-wrapper" ,ld-wrapper) - ("binutils" ,binutils-final) - ("gcc" ,gcc-final) - ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("locales" ,glibc-utf8-locales-final))))) + (parameterize ((%current-system system)) + (let ((finalize (compose with-boot6 + package-with-bootstrap-guile))) + `(,@(map (match-lambda + ((name package) + (list name (finalize package)))) + `(("tar" ,tar) + ("gzip" ,gzip) + ("bzip2" ,bzip2) + ("file" ,file) + ("diffutils" ,diffutils) + ("patch" ,patch) + ("findutils" ,findutils) + ("gawk" ,gawk))) + ("sed" ,sed-final) + ("grep" ,grep-final) + ("xz" ,xz-final) + ("coreutils" ,coreutils-final) + ("make" ,gnu-make-final) + ("bash" ,bash-final) + ("ld-wrapper" ,ld-wrapper) + ("binutils" ,binutils-final) + ("gcc" ,gcc-final) + ("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ("locales" ,glibc-utf8-locales-final)))))) (define-public canonical-package (let ((name->package (mlambda (system) -- 2.41.0 From unknown Sat Aug 16 19:18:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64763] [PATCH] gnu: commencement: Use system in %final-inputs. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Aug 2023 21:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64763 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: Christopher Baines , 64763@debbugs.gnu.org Received: via spool by 64763-submit@debbugs.gnu.org id=B64763.16916167003801 (code B ref 64763); Wed, 09 Aug 2023 21:32:02 +0000 Received: (at 64763) by debbugs.gnu.org; 9 Aug 2023 21:31:40 +0000 Received: from localhost ([127.0.0.1]:40626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTqmK-0000zF-C7 for submit@debbugs.gnu.org; Wed, 09 Aug 2023 17:31:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTqmI-0000z3-N7 for 64763@debbugs.gnu.org; Wed, 09 Aug 2023 17:31:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTqmD-0000gd-03; Wed, 09 Aug 2023 17:31:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=iL6l9z7v8DV4Tz4z0dgjTEw94sCCCaKFT0mzaaAKX0Q=; b=n85Du8W7pNFRZ/A9JoUb P5O4q+nSDpa7/6ORPH1OFZZkTbzIYcwaGxSVrNHx/D9vSVGVIyPKHk3LtcMw9BbE/FcuJknKY2be4 uloTm6HLWC7/UmoS6gHpvcXCr5Pi96sEy+NYeov3wtfIi0cv/6tx+N4sQOvApEH8Iwpi8296gdvV9 KHp0OvXkz59CPl5tATwqaexSNe1YKp6FyKssuBIrPkwJ8YtEYKWuLpjXXbznr6if8crUtqD1df5cJ EkSa9GTB3ttkZmeAXiPWM/KufCdS+gjihDbLjbkjr+7jaQ+40HH2ybDNt14iA2UL6WjhEz7PMWiP5 NNBodJ9GLl8YNQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87h6pasxof.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Duodi 22 Thermidor an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour du =?UTF-8?Q?C=C3=A2prier?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 09 Aug 2023 23:31:29 +0200 In-Reply-To: (Josselin Poiret's message of "Wed, 9 Aug 2023 09:38:31 +0200") Message-ID: <87edkboqby.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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: -3.3 (---) Hi, Josselin Poiret skribis: > From: Christopher Baines > > Otherwise this causes odd issues, I presume arising from when %current-sy= stem > differs from the system argument passed to %final-inputs. > > * gnu/packages/commencement.scm (%final-inputs): Set %current-system to > system. > * gnu/packages/base.scm (%final-inputs): Add optional system parameter. > * gnu/ci.scm (base-packages): New procedure to memoize the base packages > depending on system. > (package->job): Pass system to base-packages. > > Co-authored-by: Josselin Poiret > Signed-off-by: Josselin Poiret LGTM! Great that you found the (gnu ci) issue. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 18 09:17:31 2023 Received: (at control) by debbugs.gnu.org; 18 Aug 2023 13:17:31 +0000 Received: from localhost ([127.0.0.1]:46337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWzM2-0005rp-Rc for submit@debbugs.gnu.org; Fri, 18 Aug 2023 09:17:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWzM0-0005rZ-Kk for control@debbugs.gnu.org; Fri, 18 Aug 2023 09:17:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWzLu-00069X-3r for control@debbugs.gnu.org; Fri, 18 Aug 2023 09:17:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=BCfm3+BkE26ztx6qI/FnstrpEDaifpzhaIuf0KfLATs=; b=prdMfy/9ZNIpl+ HItQFLrzn1zbFG4Fk4AUmz2TOQr0Q7Vcnx09pTHXa6i8eKU5Eee3N1jOhOxp3slEHbWQpNAyP1jgu DVDI5LMWDiADpkx4DyHXYdd1gLYKoVsqBU8vf5giTO8/ewXAibE2XahAkXiCVE11tG1oF4oo16wqz TC6a7D7rVt608cnniii+hGOdCd0qphFRyhBgamknGNox0N1aSwsyoAW1FmBtaVh7bj9+lfRWgNuJm Afo8qeqVAYNixMOel/Uru1ufJwfZlbVFnq3PgAsm5m4LxVxKfnUwVTH6oaOA8JoDrabHHm43q/g5V GC/3k1gqrA3XdCQt0EWA==; Date: Fri, 18 Aug 2023 15:17:18 +0200 Message-Id: <87h6owtrq9.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #64763 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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: -3.3 (---) severity 64763 important quit From unknown Sat Aug 16 19:18:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#64763: closed (Re: bug#64763: [PATCH] gnu: commencement: Use system in %final-inputs.) Message-ID: References: <87o7j4qvwt.fsf_-_@gnu.org> <3e0a5d1957c35a9925aab5600ee02b923584a599.1689934305.git.mail@cbaines.net> X-Gnu-PR-Message: they-closed 64763 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64763@debbugs.gnu.org Date: Fri, 18 Aug 2023 14:16:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1692368163-18317-1" This is a multi-part message in MIME format... ------------=_1692368163-18317-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64763: [PATCH] gnu: commencement: Use system in %final-inputs. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64763@debbugs.gnu.org. --=20 64763: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64763 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1692368163-18317-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64763-done) by debbugs.gnu.org; 18 Aug 2023 14:15:28 +0000 Received: from localhost ([127.0.0.1]:48488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX0G7-0003WY-Ge for submit@debbugs.gnu.org; Fri, 18 Aug 2023 10:15:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX0G4-000398-Kl for 64763-done@debbugs.gnu.org; Fri, 18 Aug 2023 10:15:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qX0Fy-0007mu-D2; Fri, 18 Aug 2023 10:15:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=NhcCjl3L3xFevM9Ins/lb6DLFot8dRAYLOH5ZMnKl7Y=; b=DHYNNxfkGTwl/NLz8mnB 2xBoESnyIV+nhOHKrf98OlxlrNEILexESkgrj5lMLLk4NL+aE10BFq3itrXLyKjMsKwtPCa7sRbZj 9IR2xTWfFI0A5dEO7u7WGci0/4hiZYJacLvQO8+hkHlgjgFSmAGvnf7JVKq98JBSx6csvoeXkZCk2 mIw++8RAvEbfzQ/gIK9Jnb02+aDXeOU/yadMnRDdjs2uTfO8UlWwSORMvHYwkvTp2fjDHTGYSDAwu FE/Wy/CsHHteCXYPFMFv8ZccLmK4/Nix4EjKkBs/igqi/gXhE0ybjVbEEsgqrYGxvWc9mYmUMGWOW uk/MejbtlO72OQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#64763: [PATCH] gnu: commencement: Use system in %final-inputs. References: <87h6pasxof.fsf@gnu.org> <87edkboqby.fsf@gnu.org> Date: Fri, 18 Aug 2023 16:15:14 +0200 In-Reply-To: <87edkboqby.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Wed, 09 Aug 2023 23:31:29 +0200") Message-ID: <87o7j4qvwt.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64763-done Cc: 64763-done@debbugs.gnu.org, Christopher Baines 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: -3.3 (---) Ludovic Court=C3=A8s skribis: > Josselin Poiret skribis: > >> From: Christopher Baines >> >> Otherwise this causes odd issues, I presume arising from when %current-s= ystem >> differs from the system argument passed to %final-inputs. >> >> * gnu/packages/commencement.scm (%final-inputs): Set %current-system to >> system. >> * gnu/packages/base.scm (%final-inputs): Add optional system parameter. >> * gnu/ci.scm (base-packages): New procedure to memoize the base packages >> depending on system. >> (package->job): Pass system to base-packages. >> >> Co-authored-by: Josselin Poiret >> Signed-off-by: Josselin Poiret > > LGTM! Great that you found the (gnu ci) issue. Pushed on your behalf as 560cb51e7b37e2c6f6fe4b72a3781185c57fdf83. Thanks again! Ludo=E2=80=99. ------------=_1692368163-18317-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Jul 2023 10:12:03 +0000 Received: from localhost ([127.0.0.1]:60567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMn7C-0001K4-MD for submit@debbugs.gnu.org; Fri, 21 Jul 2023 06:12:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMn78-0001JS-IE for submit@debbugs.gnu.org; Fri, 21 Jul 2023 06:12:02 -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 1qMn70-0007wD-KN for guix-patches@gnu.org; Fri, 21 Jul 2023 06:11:51 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMn6y-0003st-Mp for guix-patches@gnu.org; Fri, 21 Jul 2023 06:11:50 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 5010727BBE2 for ; Fri, 21 Jul 2023 11:11:46 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ed6cf816 for ; Fri, 21 Jul 2023 10:11:46 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: commencement: Use system in %final-inputs. Date: Fri, 21 Jul 2023 11:11:45 +0100 Message-ID: <3e0a5d1957c35a9925aab5600ee02b923584a599.1689934305.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit 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: -0.1 (/) Otherwise this causes odd issues, I presume arising from when %current-system differs from the system argument passed to %final-inputs. * gnu/packages/commencement.scm (%final-inputs): Set %current-system to system. --- gnu/packages/commencement.scm | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fe6f025257..e522e70444 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3459,31 +3459,32 @@ (define-public %final-inputs ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are ;; used for origins that have patches, thereby avoiding circular ;; dependencies. - (let ((finalize (compose with-boot6 - package-with-bootstrap-guile))) - `(,@(map (match-lambda - ((name package) - (list name (finalize package)))) - `(("tar" ,tar) - ("gzip" ,gzip) - ("bzip2" ,bzip2) - ("file" ,file) - ("diffutils" ,diffutils) - ("patch" ,patch) - ("findutils" ,findutils) - ("gawk" ,gawk))) - ("sed" ,sed-final) - ("grep" ,grep-final) - ("xz" ,xz-final) - ("coreutils" ,coreutils-final) - ("make" ,gnu-make-final) - ("bash" ,bash-final) - ("ld-wrapper" ,ld-wrapper) - ("binutils" ,binutils-final) - ("gcc" ,gcc-final) - ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("locales" ,glibc-utf8-locales-final))))) + (parameterize ((%current-system system)) + (let ((finalize (compose with-boot6 + package-with-bootstrap-guile))) + `(,@(map (match-lambda + ((name package) + (list name (finalize package)))) + `(("tar" ,tar) + ("gzip" ,gzip) + ("bzip2" ,bzip2) + ("file" ,file) + ("diffutils" ,diffutils) + ("patch" ,patch) + ("findutils" ,findutils) + ("gawk" ,gawk))) + ("sed" ,sed-final) + ("grep" ,grep-final) + ("xz" ,xz-final) + ("coreutils" ,coreutils-final) + ("make" ,gnu-make-final) + ("bash" ,bash-final) + ("ld-wrapper" ,ld-wrapper) + ("binutils" ,binutils-final) + ("gcc" ,gcc-final) + ("libc" ,glibc-final) + ("libc:static" ,glibc-final "static") + ("locales" ,glibc-utf8-locales-final)))))) (define-public canonical-package (let ((name->package (mlambda (system) base-commit: 120f1721b2b66e5c9507556267bbfd83945958ce prerequisite-patch-id: 9576d8ce545492d52fbe016d30103a51a9ddf94f -- 2.41.0 ------------=_1692368163-18317-1--