me/guix
Archived
1
0
Fork 0
Code Activity

reconfigure: Use SRFI-71 instead of SRFI-11.

Browse source 
* guix/scripts/system/reconfigure.scm (upgrade-shepherd-services)
(channel-relations): Use SRFI-71.
This commit is contained in:
Ludovic Courtès 2022-11-22 08:41:32 +01:00
parent b2b9571935
commit d07dd4ccdf
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
guix/scripts/system/reconfigure.scm
View file

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