From 55e1f25d89bd3cf68cb91be315ac1961ab984042 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 20 Mar 2016 22:46:45 +0100 Subject: build-system/gnu: Add #:disallowed-references. * guix/build-system/gnu.scm (gnu-build): Add #:disallowed-references and honor it. (gnu-cross-build): Likewise. --- guix/build-system/gnu.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'guix/build-system/gnu.scm') diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index afd57668e2..a7d1952b57 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -296,7 +296,8 @@ (define* (gnu-build store name input-drvs (imported-modules %gnu-build-system-modules) (modules %default-modules) (substitutable? #t) - allowed-references) + allowed-references + disallowed-references) "Return a derivation called NAME that builds from tarball SOURCE, with input derivation INPUTS, using the usual procedure of the GNU Build System. The builder is run with GUILE, or with the distro's final Guile @@ -313,7 +314,8 @@ (define* (gnu-build store name input-drvs returned derivations, or whether they should always build it locally. ALLOWED-REFERENCES can be either #f, or a list of packages that the outputs -are allowed to refer to." +are allowed to refer to. Likewise for DISALLOWED-REFERENCES, which lists +packages that must not be referenced." (define canonicalize-reference (match-lambda ((? package? p) @@ -378,6 +380,10 @@ (define guile-for-build (and allowed-references (map canonicalize-reference allowed-references)) + #:disallowed-references + (and disallowed-references + (map canonicalize-reference + disallowed-references)) #:guile-for-build guile-for-build)) @@ -432,7 +438,8 @@ (define* (gnu-cross-build store name (imported-modules %gnu-build-system-modules) (modules %default-modules) (substitutable? #t) - allowed-references) + allowed-references + disallowed-references) "Cross-build NAME for TARGET, where TARGET is a GNU triplet. INPUTS are cross-built inputs, and NATIVE-INPUTS are inputs that run on the build platform." @@ -524,6 +531,10 @@ (define guile-for-build (and allowed-references (map canonicalize-reference allowed-references)) + #:disallowed-references + (and disallowed-references + (map canonicalize-reference + disallowed-references)) #:guile-for-build guile-for-build)) (define gnu-build-system -- cgit v1.2.3