Subject: [PATCH 2/3] etc: upgrade: Really compute joint upgrades.

From: Ludovic Courtès <[email-masked]>
Date: Sun, 15 Dec 2024 17:25:41 +0100

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