civodul pushed a commit to branch master
in repository guix.
commit b574cee361bdabf21f5506252b6a183dcfcd028d
Author: Ludovic Courtès <[email protected]>
Date: Tue Nov 7 18:06:46 2017 +0100
hydra: Add jobs for all of '%final-inputs'.
* build-aux/hydra/gnu-system.scm (package->job): Create a 'base.' job
when PACKAGE is a member of BASE-PACKAGES.
(all-packages)[adjust]: New procedure.
Fold over %FINAL-INPUTS and add it to the result.
---
build-aux/hydra/gnu-system.scm | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 2e29cba..d9b9c55 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -251,7 +251,8 @@ all its dependencies, and ready to be installed on
non-GuixSD distributions.")
"Return a job for PACKAGE on SYSTEM, or #f if this combination is not
valid."
(cond ((member package base-packages)
- #f)
+ (package-job store (symbol-append 'base. (job-name package))
+ package system))
((supported-package? package system)
(let ((drv (package-derivation store package system
#:graft? #f)))
@@ -263,16 +264,21 @@ valid."
(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))))
- '()
+ (define (adjust 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))))
+
+ (fold-packages adjust
+ (fold adjust '() ;include base packages
+ (match (%final-inputs)
+ (((labels packages _ ...) ...)
+ packages)))
#:select? (const #t))) ;include hidden packages
