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,26 +249,35 @@ 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)))
;; Return one job for each package, except bootstrap packages. ;; Turn off grafts. Grafting is meant to happen on the user's machines.
(append-map (lambda (system) (parameterize ((%graft? #f))
(case subset ;; Return one job for each package, except bootstrap packages.
((all) (append-map (lambda (system)
;; Build everything. (case subset
(let ((all (fold-packages cons '())) ((all)
(job (lambda (package) ;; Build everything, including replacements.
(package->job store package (let ((all (fold-packages
system)))) (lambda (package result)
(append (filter-map job all) (if (package-replacement package)
(qemu-jobs store system) (cons* package
(tarball-jobs store system) (package-replacement package)
(cross-jobs system)))) result)
((core) (cons package result)))
;; Build core packages only. '()))
(append (map (lambda (package) (job (lambda (package)
(package-job store (job-name package) (package->job store package
package system)) system))))
%core-packages) (append (filter-map job all)
(cross-jobs system))) (qemu-jobs store system)
(else (tarball-jobs store system)
(error "unknown subset" subset)))) (cross-jobs system))))
%hydra-supported-systems)) ((core)
;; Build core packages only.
(append (map (lambda (package)
(package-job store (job-name package)
package system))
%core-packages)
(cross-jobs system)))
(else
(error "unknown subset" subset))))
%hydra-supported-systems)))