diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-11-21 16:00:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-11-21 16:33:53 +0100 |
| commit | 9c960731d64630b1cc1f3fac1fec646dc339a12c (patch) | |
| tree | 63bbcf800d0d13f8099a1fa02fd7819bed906607 /build-aux | |
| parent | c09e60e4d51259a752029999199b89b30ccddef3 (diff) | |
| download | gnu-guix-9c960731d64630b1cc1f3fac1fec646dc339a12c.tar gnu-guix-9c960731d64630b1cc1f3fac1fec646dc339a12c.tar.gz | |
hydra: Build only non-grafted variants of the packages.
* build-aux/hydra/gnu-system.scm (package->alist): Pass #:graft? #f.
(package-cross-job): Adjust last argument of 'package->alist' to
accept #:graft?. This fixes the problem reported in commit a480307.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 6bcfbf5dc3..f62c9cb11d 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -70,7 +70,8 @@ #:optional (package-derivation package-derivation)) "Convert PACKAGE to an alist suitable for Hydra." `((derivation . ,(derivation-file-name - (package-derivation store package system))) + (package-derivation store package system + #:graft? #f))) (description . ,(package-synopsis package)) (long-description . ,(package-description package)) (license . ,(package-license package)) @@ -93,7 +94,9 @@ SYSTEM." `(,(symbol-append (string->symbol target) (string->symbol ".") job-name (string->symbol ".") (string->symbol system)) . ,(cute package->alist store package system - (cut package-cross-derivation <> <> target <>)))) + (lambda* (store package system #:key graft?) + (package-cross-derivation store package target system + #:graft? graft?))))) (define %core-packages ;; Note: Don't put the '-final' package variants because (1) that's |