From unknown Sun Jun 22 08:11:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2024 16:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74888@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173427987024065 (code B ref -1); Sun, 15 Dec 2024 16:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2024 16:24:30 +0000 Received: from localhost ([127.0.0.1]:51702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrPy-0006G3-4w for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:24:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:54446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrPv-0006Fr-9K for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:24:29 -0500 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 1tMrPv-0003Xy-0R for guix-patches@gnu.org; Sun, 15 Dec 2024 11:24:27 -0500 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 1tMrPt-0006D5-Ub; Sun, 15 Dec 2024 11:24:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=zs0cYmp5CDGsqhd9EFwH4AMP+242xUd9d+2pBfhEGGo=; b=VdO5XmtPdcNi8J Pe3mN3emn/rzyfVYLwcrZwNN6NYNRCpMTCyBkHmgN7Fcja2iYhnsrTg2DKKMJdF4l67rS3k2PEu86 /JlCvyZvsLNPBTBzJPqkNnh3apb5ewM+Gr+JMLo92Y7xk7ZKPAuRk6XigSMmbU0+CIgqyOpGEiSKY zOw4dG3477lCeRwrBUJ700vNNMFFL9vxWUGZ++CWG0qEdTbu+6feU5lm8bKIPWDzdN6svb+8DLLau cLuwbfjJjxr1GKmWgGqn5qFVN0q9XsPOfRQnGp5UUu0lqyUWEmNOiOTnjeNQdSXMzRLY4M3mJdt4L bRVdcOnZymh4f4Z7hnTg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 15 Dec 2024 17:24:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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! This fixes mistakes I made in these two manifests and that led them to compute derivations that differ from what you’d get by changing the code manually. There’s still one discrepancy, which is due to the use of ‘computed-origin-method’: https://lists.gnu.org/archive/html/guix-devel/2024-12/msg00113.html Hopefully this will be addressed soon. Thanks, Ludo’. Ludovic Courtès (3): packages: Add #:recursive? to ‘package-input-rewriting’. etc: upgrade: Really compute joint upgrades. etc: ungraft: Use ‘package-mapping’ directly. doc/guix.texi | 6 +++++- etc/manifests/ungraft.scm | 13 +++++++------ etc/manifests/upgrade.scm | 3 ++- guix/packages.scm | 9 +++++++-- tests/packages.scm | 32 +++++++++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 11 deletions(-) base-commit: 0787a180b3ca64d3958438920ca1b58a2a27fba4 -- 2.46.0 From unknown Sun Jun 22 08:11:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 1/3] packages: Add #:recursive? to =?UTF-8?Q?=E2=80=98package-input-rewriting=E2=80=99.?= Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2024 16:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74888@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74888-submit@debbugs.gnu.org id=B74888.173427997724695 (code B ref 74888); Sun, 15 Dec 2024 16:27:02 +0000 Received: (at 74888) by debbugs.gnu.org; 15 Dec 2024 16:26:17 +0000 Received: from localhost ([127.0.0.1]:51717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRg-0006QB-H4 for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRc-0006Pk-Tn for 74888@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:13 -0500 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 1tMrRX-0006Tq-Kr; Sun, 15 Dec 2024 11:26:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=rTSo0qlKWhcJXPtDKOITHVi2d//E/SyXZy0e7+TxJJo=; b=r53ofPlq09tC/9A6lhbx iHegE9nCS2NgHIauv8R7vgl3b8RXPjHo0yzFAYh34dTPvFyG5kza0PjSqxtpBsyMUU0OHCe2MNfIQ 9SulmIOW/xlbkd0g3+1A5eJyE1Sp7iIkyjO06OFkFD1SDEmdDeZi+bu8GaUYPvFdeNJmn7/k6CqdM JWLu7/qm8q4URgM1AXoyadC4AViHy5KFBcjNktt7U6bDuny7I+jUtHa7pR3jjtFsr52zkZE4BZpd+ 3wsLeQjN9TZcp1lBy4H2T6JDCZwUnEq8ieUfVz0kumpwou2Dte/KkfBdd1s1O79LqpoqSrCZI5Meb lTMeyYGNE0dnLA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 15 Dec 2024 17:25:40 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) * guix/packages.scm (package-input-rewriting): Add #:recursive? [cut?]: Honor it. * tests/packages.scm ("package-input-rewriting, recursive"): New test. * doc/guix.texi (Defining Package Variants): Document it. Change-Id: Ie82f35ae0ae873dc68f8b1c0dd6616f552772e65 --- doc/guix.texi | 6 +++++- guix/packages.scm | 9 +++++++-- tests/packages.scm | 32 +++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a2915de954..995ff5ad4e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8653,13 +8653,17 @@ Defining Package Variants graph, is what the @code{package-input-rewriting} procedure in @code{(guix packages)} implements. -@deffn {Procedure} package-input-rewriting replacements [rewrite-name] [#:deep? #t] +@deffn {Procedure} package-input-rewriting replacements [rewrite-name] @ + [#:deep? #t] [#:recursive? #f] Return a procedure that, when passed a package, replaces its direct and indirect dependencies, including implicit inputs when @var{deep?} is true, according to @var{replacements}. @var{replacements} is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement. +When @var{recursive?} is true, apply replacements to the right-hand sides of +@var{replacements} as well, recursively. + Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite. @end deffn diff --git a/guix/packages.scm b/guix/packages.scm index 0ce3276051..75271b7a05 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1582,12 +1582,16 @@ (define* (package-mapping proc #:optional (cut? (const #f)) (define* (package-input-rewriting replacements #:optional (rewrite-name identity) - #:key (deep? #t)) + #:key (deep? #t) + (recursive? #f)) "Return a procedure that, when passed a package, replaces its direct and indirect dependencies, including implicit inputs when DEEP? is true, according to REPLACEMENTS. REPLACEMENTS is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement. +When RECURSIVE? is true, apply replacements to the right-hand sides of +REPLACEMENTS as well, recursively. + Optionally, REWRITE-NAME is a one-argument procedure that takes the name of a package and returns its new name after rewrite." (define replacement-property @@ -1608,7 +1612,8 @@ (define* (package-input-rewriting replacements (define (cut? p) (or (assq-ref (package-properties p) replacement-property) - (assq-ref replacements p))) + (and (not recursive?) + (assq-ref replacements p)))) (package-mapping rewrite cut? #:deep? deep?)) diff --git a/tests/packages.scm b/tests/packages.scm index 7c28e75c45..6417bc79de 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2023 Ludovic Courtès +;;; Copyright © 2012-2024 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos @@ -1501,6 +1501,36 @@ (define compressors '(("gzip" . "gz") ((("python" python) _ ...) (derivation-file-name (package-derivation %store python)))))) +(test-assert "package-input-rewriting, recursive" + (let* ((dep (dummy-package "dep" (native-inputs (list grep)))) + (p0 (dummy-package "example1" (inputs (list dep grep)))) + (p1 (dummy-package "example2" (inputs (list dep grep)))) + (replacements `((,grep . ,findutils) (,p0 . ,p1))) + (rewrite (package-input-rewriting replacements)) + (rewrite/recursive (package-input-rewriting replacements + #:recursive? #t)) + (p2 (rewrite p0)) + (p3 (rewrite/recursive p0))) + (and (string=? (package-name p2) "example2") + ;; Here P0 is replaced by P1, but P1 itself is kept unchanged. + (match (package-inputs p2) + ((("dep" dep1) ("grep" dep2)) + (and (match (package-native-inputs dep1) + ((("grep" x)) (eq? x grep))) + (eq? dep2 grep)))) + + ;; Here P0 is replaced by P1, and in addition references to GREP in + ;; P1 and its dependencies are also replaced by FINDUTILS. + (string=? (package-name p3) "example2") + (match (package-inputs p3) + ((("dep" dep1) ("grep" dep2)) + (and (match (package-native-inputs dep1) + ((("grep" x)) + (string=? (package-full-name x) + (package-full-name findutils)))) + (string=? (package-full-name dep2) + (package-full-name findutils)))))))) + (test-assert "package-input-rewriting/spec" (let* ((dep (dummy-package "chbouib" (native-inputs `(("x" ,grep))))) -- 2.46.0 From unknown Sun Jun 22 08:11:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 3/3] etc: ungraft: Use =?UTF-8?Q?=E2=80=98package-mapping=E2=80=99?= directly. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2024 16:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74888@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74888-submit@debbugs.gnu.org id=B74888.173427998024715 (code B ref 74888); Sun, 15 Dec 2024 16:27:03 +0000 Received: (at 74888) by debbugs.gnu.org; 15 Dec 2024 16:26:20 +0000 Received: from localhost ([127.0.0.1]:51723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRj-0006QX-Es for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRh-0006Q0-SE for 74888@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:18 -0500 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 1tMrRc-0006Un-Lv; Sun, 15 Dec 2024 11:26:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=JYEqRbW8cyQ4ooK/Bz9hF3chXobiY3G9WwFYJodSqwg=; b=pux2RXXDy8Q9UBSvSfuk t8QG4fh7wbe2iiM3ZhRQMZij0bHty8eBeidJ7zJBS1hVA0Ja9Hr6JHN8/U0ll17PuSLBNhrUQsLcq qdBkxbjp8kBlXEwf+HVkTtUuYQvjEKJe797xhh3F3Lz4KdAqgusBtFPpyPMM1RpkbReqla/fgBpDU 0C1KyfrAZ0yo2FtVzfWXxWhA2nYcbu4WHQhXHZarx3Dp0zdwaqEEf8cTGgc1cJARFXsJgofXbiqHl 6pAbo5gCOv1WaOr5/qX/eSlgRTK63cPlQz1/+coYWms/+9TrMEV6oP4Pa/n+z6PfgbuAzkj0alpm+ pWiA2RTF/sFP4Q==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 15 Dec 2024 17:25:42 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) * etc/manifests/ungraft.scm (ungraft): New procedure. : Use it. Remove ‘ungraft-all’. Change-Id: I6f1badf06dad9116d4242c7d1fff5ca53e6522f8 --- etc/manifests/ungraft.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/etc/manifests/ungraft.scm b/etc/manifests/ungraft.scm index 3e42b98ece..5caef65d4c 100644 --- a/etc/manifests/ungraft.scm +++ b/etc/manifests/ungraft.scm @@ -35,15 +35,16 @@ (define (grafted-packages) (length result) (map package-full-name result)) result)) +(define ungraft + (package-mapping (lambda (p) + (or (package-replacement p) p)) + #:deep? #t)) + (manifest (with-store store - (let* ((grafted (grafted-packages)) - (ungraft-all (package-input-rewriting - (map (lambda (package) - `(,package . ,(package-replacement package))) - grafted)))) + (let ((grafted (grafted-packages))) (map (lambda (package) (manifest-entry - (inherit (package->manifest-entry (ungraft-all package))) + (inherit (package->manifest-entry (ungraft package))) (name (string-append (package-name package) "-ungrafted")))) (dependents store grafted))))) -- 2.46.0 From unknown Sun Jun 22 08:11:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 2/3] etc: upgrade: Really compute joint upgrades. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2024 16:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74888@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74888-submit@debbugs.gnu.org id=B74888.173427998424733 (code B ref 74888); Sun, 15 Dec 2024 16:27:03 +0000 Received: (at 74888) by debbugs.gnu.org; 15 Dec 2024 16:26:24 +0000 Received: from localhost ([127.0.0.1]:51725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRm-0006Qn-Q6 for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRg-0006Py-Sw for 74888@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:20 -0500 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 1tMrRb-0006UV-Er; Sun, 15 Dec 2024 11:26:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=uJTc2EIkMYMpLDLHQgrqhdIiuKs1e7Z9BKJwpTaw5F4=; b=PxH7bStpfyK8C5Zuorfm TFKvXJWPZOAueYHb8Yov3ho6BhvUBXma+gXIlK9mQxwYLbtHAMGCEgmN5oIWb4JZCwOoGEekVlarb vLNBZE+Pkj/Lvj/2QE8e9hQLFlGMUCSAANdnhI2yvQjoEGFoxSCVuo0eVSkkKo507muczfeNgANH0 /n1ImSTN+rGhHEEqJuwdL8t56ltiiBRUdspr02L3MuKjXZzwXw149SuTxNLGPJ6odhxFxGoEoGvNU JJ2THP3hCLOVNtQl0yLKxxWkosY4wAJ831fWWQUmzAhG6zsvmfVFpT1LRK0qMjS5mOh3qqSVd1MqK MWlMTaSHXMe/Xw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 15 Dec 2024 17:25:41 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) Previously, since input rewriting did not happen recursively, libgcrypt would for instance be built against the old libgpg-error. * etc/manifests/upgrade.scm (joint-security-upgrades): Pass #:recursive? #t to ‘package-input-rewriting’. Change-Id: I7daaa11629aa12b833ca941a3a996c3db2754a7a --- etc/manifests/upgrade.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/manifests/upgrade.scm b/etc/manifests/upgrade.scm index 03a7d6d319..8136b8f8d4 100644 --- a/etc/manifests/upgrade.scm +++ b/etc/manifests/upgrade.scm @@ -119,7 +119,8 @@ (define joint-security-upgrades (let ((update-all (package-input-rewriting (map (lambda (package) `(,package . ,(latest-version package))) - security-packages)))) + security-packages) + #:recursive? #t))) (map (lambda (package) (manifest-entry (inherit (package->manifest-entry -- 2.46.0 From unknown Sun Jun 22 08:11:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Dec 2024 11:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74888@debbugs.gnu.org Received: via spool by 74888-submit@debbugs.gnu.org id=B74888.173452242726393 (code B ref 74888); Wed, 18 Dec 2024 11:48:02 +0000 Received: (at 74888) by debbugs.gnu.org; 18 Dec 2024 11:47:07 +0000 Received: from localhost ([127.0.0.1]:33736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNsVw-0006r0-8l for submit@debbugs.gnu.org; Wed, 18 Dec 2024 06:47:07 -0500 Received: from mail-pf1-f171.google.com ([209.85.210.171]:48604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNsVq-0006qm-LL for 74888@debbugs.gnu.org; Wed, 18 Dec 2024 06:46:50 -0500 Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-728f1525565so7548959b3a.1 for <74888@debbugs.gnu.org>; Wed, 18 Dec 2024 03:46:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734522345; x=1735127145; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zhgXxGt+9zST050cAJgFUi307IJzTk005NPGUobUa8I=; b=WbvyzryATtIQSl2Rq6m2E8OnDO/zQPU0GmzlInXhnSdCJBhZY40j2ULU6o8VhfnveZ q1Xf5U9r+kfJRrRkBRGA8HXCD5JwHcY3DhvVMYX+oU7G/JHM9SvK/1vBg33cYaLL51B1 wiMNZuBGXW3jKy9z73c/WiSFPQ+DaMRSlAy840gMEvIiwpY4EzdvEH6GMqxr9OqK9g/N LwwG4yFIUL4UcImYFV0a+uexBDgVWjq0K1LsOBWoOfThgrFjxeF6/26AW+1nVDww6Ibr f/zhaMNtOo4X2LPNXMkdk0VVoxW6aEYo45L4ZwHZ4Cy1lZc+kjQa9StzCgmA6LB+Rr/u WF9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734522345; x=1735127145; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zhgXxGt+9zST050cAJgFUi307IJzTk005NPGUobUa8I=; b=u5Bi4KLVPZuJbJckLCHp+DXQ2UHMv+L19P/1BHelz+yl4FtUa4FPhf677GpbPmRrzd So6rv3Cix8e957BY4v+5FmWwwfqMr7icRjmlxJrylFx/geXJCaiAOsZ6kAo8hJ1LYWTD 0cv9+73SkuKU94C1WXQFoI7ijSQh/irh8bmT08X3k9otJiuhd7HvWBaJI0jAqfV1xOy2 8krXj3GhS3IppTqQLA2LK1PPbEFXKgkFMY0bnoB5kQfhz6AsJbbLIzcOC4Sf13UDrgro Otm+ERtggE+bH/CzZQNk56O9Di9iU8YS+F7bmqQIxrfidBxQroS1Ac7nESHo1CakA7a7 aAzg== X-Gm-Message-State: AOJu0Yww/xWroCPczYCEnEdeNC3OvZOC5eQ+drJcd3fSj9W7Pr4zbbgP Vodw0tMnjVwFdFfBu/MGYidtXTUSv/4Dz9BW9SB2sCN+YKlfTgUqXR/kZASjb2o= X-Gm-Gg: ASbGncsiJ8Ifi4dehadudZfv71hILmFEpMyB2mYWJAAuFEuSSVXTHm4XkrGn0zcRc+d JS2/+N47LYhrjST1rJFdR38Szl535RnMilZaO9BbKRHapclg32rF9gvi5cNQ1zRKYLghM7ZVLYj tn5BeeA3YoR+XiTYSL0RIURn6PBd8abbjMzHcDKnPzEL5aThjtS3AOHAPI+MYicvb/9Cn/dVrGB ICMMCsFyCbwrGir8USlYf5ZSKwAJmJJ57g4lW8ukOaIhet69QYUXw== X-Google-Smtp-Source: AGHT+IHfIFEWCQUdA0azGtqVsMows9VReBpxJgWzWOgrB84HijgSTO8zk1uhDPxk7r8Ij/ErurjoMQ== X-Received: by 2002:a05:6a00:35c3:b0:725:eb85:f7f7 with SMTP id d2e1a72fcca58-72a8d01e724mr4328492b3a.5.1734522345297; Wed, 18 Dec 2024 03:45:45 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ac5296sm8592539b3a.22.2024.12.18.03.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 03:45:44 -0800 (PST) From: Maxim Cournoyer In-Reply-To: ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 15 Dec 2024 17:24:14 +0100") References: Date: Wed, 18 Dec 2024 20:45:35 +0900 Message-ID: <87y10dnrj4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > Hi! > > This fixes mistakes I made in these two manifests and that led them > to compute derivations that differ from what you=E2=80=99d get by changing > the code manually. > > There=E2=80=99s still one discrepancy, which is due to the use of > =E2=80=98computed-origin-method=E2=80=99: > > https://lists.gnu.org/archive/html/guix-devel/2024-12/msg00113.html > > Hopefully this will be addressed soon. > > Thanks, > Ludo=E2=80=99. > > Ludovic Court=C3=A8s (3): > packages: Add #:recursive? to =E2=80=98package-input-rewriting=E2=80=99. > etc: upgrade: Really compute joint upgrades. > etc: ungraft: Use =E2=80=98package-mapping=E2=80=99 directly. I've proof-read carefully everything, but haven't tried it. Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From unknown Sun Jun 22 08:11:12 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Subject: bug#74888: closed (Re: [bug#74888] [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests) Message-ID: References: <87y10cj3ke.fsf@gnu.org> X-Gnu-PR-Message: they-closed 74888 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74888@debbugs.gnu.org Date: Wed, 18 Dec 2024 17:38:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1734543482-30235-1" This is a multi-part message in MIME format... ------------=_1734543482-30235-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74888: [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests 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 74888@debbugs.gnu.org. --=20 74888: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74888 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1734543482-30235-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74888-done) by debbugs.gnu.org; 18 Dec 2024 17:37:29 +0000 Received: from localhost ([127.0.0.1]:35849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNxzF-0007qb-7h for submit@debbugs.gnu.org; Wed, 18 Dec 2024 12:37:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNxzD-0007qF-Bg for 74888-done@debbugs.gnu.org; Wed, 18 Dec 2024 12:37:27 -0500 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 1tNxz8-0004Mf-3v; Wed, 18 Dec 2024 12:37:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=YYQm2scQ+L5vJ3KfjeA/LY3zrOw8Dfz6ZtE4MZAJCSs=; b=m7aLD8L4sRnAFOZFm8Hg OHLV9xhMLHxgNonVcwbTkoL8wEfmmvcsTvu6Gwc7bMgt+PZk9RYsNM2EhwBo544CQ2OzvxWWtgHY1 VDKX90Uy20zNg+ye8S2MgqcloHt0otNtEzGNooEtsuDmQ2VkOJ5+dRF/qJTsSL0dJKO9CQshvPBhv +RuBtt/pa8XIadiLo4xJ1OzT3I+LWtrsalBxx0B//Zm7ZGMVZJO9XIxfMz81LbG7IpAgaVk84viBC Tzr4udXf5PP/CW1tKXszrxpkqqItxY3X5ezNfwiFj8PADtEsVMFxyOeM/wSt3/F/bmN807V31YJc3 pPNruqPippfCaQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: [bug#74888] [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests In-Reply-To: <87y10dnrj4.fsf@gmail.com> (Maxim Cournoyer's message of "Wed, 18 Dec 2024 20:45:35 +0900") References: <87y10dnrj4.fsf@gmail.com> Date: Wed, 18 Dec 2024 18:36:49 +0100 Message-ID: <87y10cj3ke.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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: 74888-done Cc: 74888-done@debbugs.gnu.org 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, Maxim Cournoyer skribis: >> packages: Add #:recursive? to =E2=80=98package-input-rewriting=E2=80= =99. >> etc: upgrade: Really compute joint upgrades. >> etc: ungraft: Use =E2=80=98package-mapping=E2=80=99 directly. > > I've proof-read carefully everything, but haven't tried it. Thank you. Pushed as 777fde8299d5b0050cae661d403374a7dd87f6ab. Ludo=E2=80=99. ------------=_1734543482-30235-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 Dec 2024 16:24:30 +0000 Received: from localhost ([127.0.0.1]:51702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrPy-0006G3-4w for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:24:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:54446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrPv-0006Fr-9K for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:24:29 -0500 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 1tMrPv-0003Xy-0R for guix-patches@gnu.org; Sun, 15 Dec 2024 11:24:27 -0500 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 1tMrPt-0006D5-Ub; Sun, 15 Dec 2024 11:24:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=zs0cYmp5CDGsqhd9EFwH4AMP+242xUd9d+2pBfhEGGo=; b=VdO5XmtPdcNi8J Pe3mN3emn/rzyfVYLwcrZwNN6NYNRCpMTCyBkHmgN7Fcja2iYhnsrTg2DKKMJdF4l67rS3k2PEu86 /JlCvyZvsLNPBTBzJPqkNnh3apb5ewM+Gr+JMLo92Y7xk7ZKPAuRk6XigSMmbU0+CIgqyOpGEiSKY zOw4dG3477lCeRwrBUJ700vNNMFFL9vxWUGZ++CWG0qEdTbu+6feU5lm8bKIPWDzdN6svb+8DLLau cLuwbfjJjxr1GKmWgGqn5qFVN0q9XsPOfRQnGp5UUu0lqyUWEmNOiOTnjeNQdSXMzRLY4M3mJdt4L bRVdcOnZymh4f4Z7hnTg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests Date: Sun, 15 Dec 2024 17:24:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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! This fixes mistakes I made in these two manifests and that led them to compute derivations that differ from what you’d get by changing the code manually. There’s still one discrepancy, which is due to the use of ‘computed-origin-method’: https://lists.gnu.org/archive/html/guix-devel/2024-12/msg00113.html Hopefully this will be addressed soon. Thanks, Ludo’. Ludovic Courtès (3): packages: Add #:recursive? to ‘package-input-rewriting’. etc: upgrade: Really compute joint upgrades. etc: ungraft: Use ‘package-mapping’ directly. doc/guix.texi | 6 +++++- etc/manifests/ungraft.scm | 13 +++++++------ etc/manifests/upgrade.scm | 3 ++- guix/packages.scm | 9 +++++++-- tests/packages.scm | 32 +++++++++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 11 deletions(-) base-commit: 0787a180b3ca64d3958438920ca1b58a2a27fba4 -- 2.46.0 ------------=_1734543482-30235-1--