nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hydra: Really completely disable grafting. 

This is a followup to 49c4fd2a.

* build-aux/hydra/gnu-system.scm (package->alist): Parameterize %graft?.
(qemu-jobs)[->job]: Likewise.
(tarball-jobs)[->job]: Likewise.
This commit is contained in:
Ludovic Courtès 2016-04-13 19:08:41 +02:00
parent 0de9813905
commit 9c3bb4c54d
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@
(define* (package->alist store package system (define* (package->alist store package system
#: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."
(parameterize ((%graft? #f))
`((derivation . ,(derivation-file-name `((derivation . ,(derivation-file-name
(package-derivation store package system (package-derivation store package system
#:graft? #f))) #:graft? #f)))
@ -83,7 +84,7 @@
'max-silent-time) 'max-silent-time)
3600)) ;1 hour by default 3600)) ;1 hour by default
(timeout . ,(or (assoc-ref (package-properties package) 'timeout) (timeout . ,(or (assoc-ref (package-properties package) 'timeout)
72000)))) ; 20 hours by default 72000))))) ;20 hours by default
(define (package-job store job-name package system) (define (package-job store job-name package system)
"Return a job called JOB-NAME that builds PACKAGE on SYSTEM." "Return a job called JOB-NAME that builds PACKAGE on SYSTEM."
@ -142,7 +143,9 @@ system.")
(define (->job name drv) (define (->job name drv)
(let ((name (symbol-append name (string->symbol ".") (let ((name (symbol-append name (string->symbol ".")
(string->symbol system)))) (string->symbol system))))
`(,name . ,(cut ->alist drv)))) `(,name . ,(lambda ()
(parameterize ((%graft? #f))
(->alist drv))))))
(define MiB (define MiB
(expt 2 20)) (expt 2 20))
@ -178,7 +181,9 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.")
(define (->job name drv) (define (->job name drv)
(let ((name (symbol-append name (string->symbol ".") (let ((name (symbol-append name (string->symbol ".")
(string->symbol system)))) (string->symbol system))))
`(,name . ,(cut ->alist drv)))) `(,name . ,(lambda ()
(parameterize ((%graft? #f))
(->alist drv))))))
;; XXX: Add a job for the stable Guix? ;; XXX: Add a job for the stable Guix?
(list (->job 'binary-tarball (list (->job 'binary-tarball