diff options
| author | Marius Bakke <marius@gnu.org> | 2022-11-26 15:39:18 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-11-26 15:39:18 +0100 |
| commit | fe99fe84f0fe5b4cd97768c6dbb60a07404f24a1 (patch) | |
| tree | c87214ce4b80f0eb9a068553cc25f201bddae66c /guix/scripts/system | |
| parent | 2e68be4ca88368c94b1eb1123ef437605b7b904f (diff) | |
| parent | c457c715a83358fa1557f703b1e459435fb1a259 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/system')
| -rw-r--r-- | guix/scripts/system/reconfigure.scm | 20 |
1 files 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))))) |