From 9c960731d64630b1cc1f3fac1fec646dc339a12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 21 Nov 2014 16:00:47 +0100
Subject: [PATCH] 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.
---
build-aux/hydra/gnu-system.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 6bcfbf5dc3f..f62c9cb11d5 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -70,7 +70,8 @@ (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)))
+ (package-derivation store package system
+ #:graft? #f)))
(description . ,(package-synopsis package))
(long-description . ,(package-description package))
(license . ,(package-license package))
@@ -93,7 +94,9 @@ (define (package-cross-job store job-name package target system)
`(,(symbol-append (string->symbol target) (string->symbol ".") job-name
(string->symbol ".") (string->symbol 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
;; Note: Don't put the '-final' package variants because (1) that's
--
GitLab