diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-11-07 18:06:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-11-07 18:09:13 +0100 |
| commit | b574cee361bdabf21f5506252b6a183dcfcd028d (patch) | |
| tree | dc00d5610621fa3f299c6e311d4ff9f721133822 /build-aux/hydra | |
| parent | f4433d09a181e2733643a69379e2b1404c59c66c (diff) | |
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.
Diffstat (limited to 'build-aux/hydra')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 2e29cbaebc..d9b9c55d9c 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 |