diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-02-13 20:13:16 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-02-13 23:11:36 +0000 |
| commit | 5410961f659cafd484e5bf7234e7cbd464a822a7 (patch) | |
| tree | 061b24db98c2db0d95e934476a81dafc0e6e3c7a | |
| parent | 0ef3349ed883bbaf3c6a10b4349b1a6f0d48c5e5 (diff) | |
| download | data-service-5410961f659cafd484e5bf7234e7cbd464a822a7.tar data-service-5410961f659cafd484e5bf7234e7cbd464a822a7.tar.gz | |
Add temporary roots for channel instance derivations
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 9a3b7fc..dc18267 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -752,23 +752,29 @@ WHERE job_id = $1" (current-error-port) "error ~A: ~A\n" key args) #f)))) + (define (add-tmp-root-and-return-drv drv) + (add-temp-root store drv) + drv) + `(,system . ((manifest-entry-item . ,(and manifest - (derivation-file-name - (manifest-entry-item - (first - (manifest-entries manifest)))))) + (add-tmp-root-and-return-drv + (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))))) + (add-tmp-root-and-return-drv + (derivation-file-name + (run-with-store store + (profile-derivation + manifest + #:hooks %channel-profile-hooks)))))) (lambda (key . args) (simple-format (current-error-port) |