summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--build-aux/hydra/gnu-system.scm17
1 files changed, 8 insertions, 9 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index c3cb9cc7fa..fb22396da9 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -253,15 +253,14 @@ valid."
                 (case subset
                   ((all)
                    ;; Build everything.
-                   (fold-packages (lambda (package result)
-                                    (let ((job (package->job store package
-                                                             system)))
-                                      (if job
-                                          (cons job result)
-                                          result)))
-                                  (append (qemu-jobs store system)
-                                          (tarball-jobs store system)
-                                          (cross-jobs system))))
+                   (let ((all (fold-packages cons '()))
+                         (job (lambda (package)
+                                (package->job store package
+                                              system))))
+                     (append (filter-map job all)
+                             (qemu-jobs store system)
+                             (tarball-jobs store system)
+                             (cross-jobs system))))
                   ((core)
                    ;; Build core packages only.
                    (append (map (lambda (package)