06/07: reconfigure: Use SRFI-71 instead of SRFI-11.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit d07dd4ccdf499d3151f4d9f9fd8fd81e0015e867
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Nov 22 08:41:32 2022 +0100

    reconfigure: Use SRFI-71 instead of SRFI-11.
    
    * guix/scripts/system/reconfigure.scm (upgrade-shepherd-services)
    (channel-relations): Use SRFI-71.
---
 guix/scripts/system/reconfigure.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/guix/scripts/system/reconfigure.scm 
b/guix/scripts/system/reconfigure.scm
index afd410d4bc..544aacfef4 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -40,9 +40,9 @@
   #:use-module (guix diagnostics)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-35)
+  #:use-module (srfi srfi-71)
   #:use-module ((guix config) #:select (%guix-package-name))
   #:export (switch-system-program
             switch-to-system
@@ -184,8 +184,8 @@ services as defined by OS."
                      #:target-type shepherd-root-service-type))))
 
   (mlet* %store-monad ((live-services (running-services eval)))
-    (let*-values (((to-unload to-restart)
-                   (shepherd-service-upgrade live-services target-services)))
+    (let ((to-unload to-restart
+                     (shepherd-service-upgrade live-services target-services)))
       (let* ((to-unload  (map live-service-canonical-name to-unload))
              (to-restart (map shepherd-service-canonical-name to-restart))
              (running    (map live-service-canonical-name
@@ -347,14 +347,12 @@ to commits of channels in NEW."
                                         (channel-name old)))
                                  new)))
                   (and new
-                       (let-values (((checkout commit relation)
-                                     (update-cached-checkout
-                                      (channel-url new)
-                                      #:ref
-                                      `(commit . ,(channel-commit new))
-                                      #:starting-commit
-                                      (channel-commit old)
-                                      #:check-out? #f)))
+                       (let ((checkout commit relation
+                                       (update-cached-checkout
+                                        (channel-url new)
+                                        #:ref `(commit . ,(channel-commit new))
+                                        #:starting-commit (channel-commit old)
+                                        #:check-out? #f)))
                          (list new
                                (channel-commit old) (channel-commit new)
                                relation)))))