03/07: Process each system target pair individually

[Christopher Baines]

cbaines pushed a commit to branch master
in repository data-service.

commit 8379427cbbb3f82a349562b626f494daf7050c96
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri Mar 11 11:12:18 2022 +0000

    Process each system target pair individually
    
    As the cross targets take quite some time.
---
 guix-data-service/jobs/load-new-guix-revision.scm | 15 +++++++--------
 1 file 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)