hydra: Completely disable grafting.

* build-aux/hydra/gnu-system.scm (hydra-jobs): Parameterize '%graft?'.
Build package replacements when they are available.
This commit is contained in:
Ludovic Courtès 2016-03-02 23:42:57 +01:00
parent f8187bde7f
commit 49c4fd2aab
1 changed files with 33 additions and 23 deletions

View File

@ -38,6 +38,7 @@
(use-modules (guix config) (use-modules (guix config)
(guix store) (guix store)
(guix grafts)
(guix packages) (guix packages)
(guix derivations) (guix derivations)
(guix monads) (guix monads)
@ -248,12 +249,21 @@ valid."
%packages-to-cross-build)) %packages-to-cross-build))
(remove (either from-32-to-64? same?) %cross-targets))) (remove (either from-32-to-64? same?) %cross-targets)))
;; Turn off grafts. Grafting is meant to happen on the user's machines.
(parameterize ((%graft? #f))
;; Return one job for each package, except bootstrap packages. ;; Return one job for each package, except bootstrap packages.
(append-map (lambda (system) (append-map (lambda (system)
(case subset (case subset
((all) ((all)
;; Build everything. ;; Build everything, including replacements.
(let ((all (fold-packages cons '())) (let ((all (fold-packages
(lambda (package result)
(if (package-replacement package)
(cons* package
(package-replacement package)
result)
(cons package result)))
'()))
(job (lambda (package) (job (lambda (package)
(package->job store package (package->job store package
system)))) system))))
@ -270,4 +280,4 @@ valid."
(cross-jobs system))) (cross-jobs system)))
(else (else
(error "unknown subset" subset)))) (error "unknown subset" subset))))
%hydra-supported-systems)) %hydra-supported-systems)))