aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-04-13 19:08:41 +0200
committerLudovic Courtès <ludo@gnu.org>2016-04-13 19:20:03 +0200
commit9c3bb4c54d67899394af81c819fe60f391e35edf (patch)
treea3a6a5b67187f37c38921b5da8a59ab1a7c62e5c
parent0de9813905ebec00d1b1e8fbabe8dc024900180a (diff)
downloadpatches-9c3bb4c54d67899394af81c819fe60f391e35edf.tar
patches-9c3bb4c54d67899394af81c819fe60f391e35edf.tar.gz
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.
-rw-r--r--build-aux/hydra/gnu-system.scm35
1 files changed, 20 insertions, 15 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 548d9e044a..d15be1bad2 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -71,19 +71,20 @@
(define* (package->alist store package system
#:optional (package-derivation package-derivation))
"Convert PACKAGE to an alist suitable for Hydra."
- `((derivation . ,(derivation-file-name
- (package-derivation store package system
- #:graft? #f)))
- (description . ,(package-synopsis package))
- (long-description . ,(package-description package))
- (license . ,(package-license package))
- (home-page . ,(package-home-page package))
- (maintainers . ("bug-guix@gnu.org"))
- (max-silent-time . ,(or (assoc-ref (package-properties package)
- 'max-silent-time)
- 3600)) ; 1 hour by default
- (timeout . ,(or (assoc-ref (package-properties package) 'timeout)
- 72000)))) ; 20 hours by default
+ (parameterize ((%graft? #f))
+ `((derivation . ,(derivation-file-name
+ (package-derivation store package system
+ #:graft? #f)))
+ (description . ,(package-synopsis package))
+ (long-description . ,(package-description package))
+ (license . ,(package-license package))
+ (home-page . ,(package-home-page package))
+ (maintainers . ("bug-guix@gnu.org"))
+ (max-silent-time . ,(or (assoc-ref (package-properties package)
+ 'max-silent-time)
+ 3600)) ;1 hour by default
+ (timeout . ,(or (assoc-ref (package-properties package) 'timeout)
+ 72000))))) ;20 hours by default
(define (package-job store job-name package system)
"Return a job called JOB-NAME that builds PACKAGE on SYSTEM."
@@ -142,7 +143,9 @@ system.")
(define (->job name drv)
(let ((name (symbol-append name (string->symbol ".")
(string->symbol system))))
- `(,name . ,(cut ->alist drv))))
+ `(,name . ,(lambda ()
+ (parameterize ((%graft? #f))
+ (->alist drv))))))
(define MiB
(expt 2 20))
@@ -178,7 +181,9 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.")
(define (->job name drv)
(let ((name (symbol-append name (string->symbol ".")
(string->symbol system))))
- `(,name . ,(cut ->alist drv))))
+ `(,name . ,(lambda ()
+ (parameterize ((%graft? #f))
+ (->alist drv))))))
;; XXX: Add a job for the stable Guix?
(list (->job 'binary-tarball