diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-02-11 08:55:34 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-02-11 08:55:34 +0000 |
| commit | 406aa5e160c14ebdc2d9a81d3e64c294a0438849 (patch) | |
| tree | d3f167d2eb6cdddfd9450bc6aed6f687f73e030f | |
| parent | 876bae182d423217a10b2b1390f357447bf43d27 (diff) | |
| download | data-service-406aa5e160c14ebdc2d9a81d3e64c294a0438849.tar data-service-406aa5e160c14ebdc2d9a81d3e64c294a0438849.tar.gz | |
Switch using set-current-system to parameterize
As this is neater.
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 5e0fa79..efc2417 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -737,46 +737,46 @@ WHERE job_id = $1" "guix-data-service: computing the derivation-file-name for ~A\n" system) - ((set-current-system system) store) - (let ((manifest - (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 + (parameterize ((%current-system system)) + (let ((manifest + (catch #t (lambda () - (and manifest - (derivation-file-name - (run-with-store store - (profile-derivation - manifest - #:hooks %channel-profile-hooks))))) + ((channel-instances->manifest instances) store)) (lambda (key . args) (simple-format (current-error-port) - "error: while computing profile derivation for ~A\n" + "error: while computing manifest entry derivation for ~A\n" system) (simple-format (current-error-port) "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))))) (with-store store |