diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-03-11 11:12:18 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-03-11 11:12:18 +0000 |
| commit | 8379427cbbb3f82a349562b626f494daf7050c96 (patch) | |
| tree | 26b80120aa34e2d244774d98700572f24e121e77 /guix-data-service/jobs | |
| parent | 9db755f27d3266ade0f93bbecd694a9531ebad0d (diff) | |
| download | data-service-8379427cbbb3f82a349562b626f494daf7050c96.tar data-service-8379427cbbb3f82a349562b626f494daf7050c96.tar.gz | |
Process each system target pair individually
As the cross targets take quite some time.
Diffstat (limited to 'guix-data-service/jobs')
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 30eadc5..a1b0679 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -589,10 +589,9 @@ WHERE job_id = $1") (append-map (match-lambda ((system . targets) - (list - (map (lambda (target) - (cons system target)) - targets)))) + (map (lambda (target) + (cons system target)) + targets))) cross-derivations)) (define (proc packages system-target-pairs) @@ -726,14 +725,14 @@ WHERE job_id = $1") (list ,@(map inferior-package-id packages))))) (append-map - (lambda (system-target-pairs) + (lambda (system-target-pair) (format (current-error-port) "heap size: ~a MiB~%" (round (/ (assoc-ref (gc-stats) 'heap-size) (expt 2. 20)))) (with-time-logging - (simple-format #f "getting derivations for ~A" system-target-pairs) + (simple-format #f "getting derivations for ~A" system-target-pair) (catch 'match-error (lambda () @@ -742,8 +741,8 @@ WHERE job_id = $1") (simple-format (current-error-port) "warning: ignoring match-error from calling inferior invalidate-derivation-caches!\n"))) - (inferior-eval-with-store inf store (proc packages system-target-pairs)))) - (append (map list supported-system-pairs) + (inferior-eval-with-store inf store (proc packages (list system-target-pair))))) + (append supported-system-pairs supported-system-cross-build-pairs))) (define (deduplicate-inferior-packages packages) |