me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2014-11-21 16:00:47 +01:00
parent c09e60e4d5
commit 9c960731d6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-aux/hydra/gnu-system.scm
View File

@ -70,7 +70,8 @@
#:optional (package-derivation package-derivation)) #:optional (package-derivation package-derivation))
"Convert PACKAGE to an alist suitable for Hydra." "Convert PACKAGE to an alist suitable for Hydra."
`((derivation . ,(derivation-file-name `((derivation . ,(derivation-file-name
(package-derivation store package system))) (package-derivation store package system
#:graft? #f)))
(description . ,(package-synopsis package)) (description . ,(package-synopsis package))
(long-description . ,(package-description package)) (long-description . ,(package-description package))
(license . ,(package-license package)) (license . ,(package-license package))
@ -93,7 +94,9 @@ SYSTEM."
`(,(symbol-append (string->symbol target) (string->symbol ".") job-name `(,(symbol-append (string->symbol target) (string->symbol ".") job-name
(string->symbol ".") (string->symbol system)) . (string->symbol ".") (string->symbol system)) .
,(cute package->alist store package 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 (define %core-packages
;; Note: Don't put the '-final' package variants because (1) that's ;; Note: Don't put the '-final' package variants because (1) that's