guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/11: hydra: Factorize package list creation.


From: Ludovic Courtès
Subject: 01/11: hydra: Factorize package list creation.
Date: Tue, 7 Nov 2017 12:12:06 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit b5033c5a9e1b1f06a7daf9b8de6ff9f9c8431a97
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 7 17:06:32 2017 +0100

    hydra: Factorize package list creation.
    
    * build-aux/hydra/gnu-system.scm (all-packages): New procedure, with
    body taken from...
    (hydra-jobs): ... here.  Use it.
---
 build-aux/hydra/gnu-system.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 146d929..1782969 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -261,6 +261,19 @@ valid."
             (else
              #f)))))
 
+(define (all-packages)
+  "Return the list of packages to build."
+  (fold-packages (lambda (package result)
+                   (cond ((package-replacement package)
+                          (cons* package          ;build both
+                                 (package-replacement package)
+                                 result))
+                         ((package-superseded package)
+                          result)                 ;don't build it
+                         (else
+                          (cons package result))))
+                 '()))
+
 
 ;;;
 ;;; Hydra entry point.
@@ -317,17 +330,7 @@ valid."
                   (case subset
                     ((all)
                      ;; Build everything, including replacements.
-                     (let ((all (fold-packages
-                                 (lambda (package result)
-                                   (cond ((package-replacement package)
-                                          (cons* package
-                                                 (package-replacement package)
-                                                 result))
-                                         ((package-superseded package)
-                                          result) ;don't build it
-                                         (else
-                                          (cons package result))))
-                                 '()))
+                     (let ((all (all-packages))
                            (job (lambda (package)
                                   (package->job store package
                                                 system))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]