cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch using set-current-system to parameterize

Browse source 
As this is neater.
This commit is contained in:
Christopher Baines 2020-02-11 08:55:34 +00:00
parent 876bae182d
commit 406aa5e160
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -737,46 +737,46 @@ WHERE job_id = $1"
"guix-data-service: computing the derivation-file-name for ~A\n" "guix-data-service: computing the derivation-file-name for ~A\n"
system) system)
((set-current-system system) store) (parameterize ((%current-system system))
(let ((manifest (let ((manifest
(catch #t (catch #t
(lambda ()
((channel-instances->manifest instances) store))
(lambda (key . args)
(simple-format
(current-error-port)
"error: while computing manifest entry derivation for ~A\n"
system)
(simple-format
(current-error-port)
"error ~A: ~A\n" key args)
#f))))
`(,system
.
((manifest-entry-item
. ,(and manifest
(derivation-file-name
(manifest-entry-item
(first
(manifest-entries manifest))))))
(profile
. ,(catch #t
(lambda () (lambda ()
(and manifest ((channel-instances->manifest instances) store))
(derivation-file-name
(run-with-store store
(profile-derivation
manifest
#:hooks %channel-profile-hooks)))))
(lambda (key . args) (lambda (key . args)
(simple-format (simple-format
(current-error-port) (current-error-port)
"error: while computing profile derivation for ~A\n" "error: while computing manifest entry derivation for ~A\n"
system) system)
(simple-format (simple-format
(current-error-port) (current-error-port)
"error ~A: ~A\n" key args) "error ~A: ~A\n" key args)
#f))))))) #f))))
`(,system
.
((manifest-entry-item
. ,(and manifest
(derivation-file-name
(manifest-entry-item
(first
(manifest-entries manifest))))))
(profile
. ,(catch #t
(lambda ()
(and manifest
(derivation-file-name
(run-with-store store
(profile-derivation
manifest
#:hooks %channel-profile-hooks)))))
(lambda (key . args)
(simple-format
(current-error-port)
"error: while computing profile derivation for ~A\n"
system)
(simple-format
(current-error-port)
"error ~A: ~A\n" key args)
#f))))))))
(list ,@systems))))) (list ,@systems)))))
(with-store store (with-store store