From 63a428246825e83c8d6a8ff181658ee0a81184d8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Jun 2014 17:07:26 +0200 Subject: derivations: 'build-expression->derivation' supports #:allowed-references. * guix/derivations.scm (build-expression->derivation): Add #:allowed-references and pass it to 'derivation. * doc/guix.texi (Derivations): Adjust accordingly. --- doc/guix.texi | 7 ++++--- guix/derivations.scm | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4d5a5150e6..10eb344c71 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1798,7 +1798,8 @@ is now deprecated in favor of the much nicer @code{gexp->derivation}. [#:system (%current-system)] [#:inputs '()] @ [#:outputs '("out")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ - [#:references-graphs #f] [#:local-build? #f] [#:guile-for-build #f] + [#:references-graphs #f] [#:allowed-references #f] @ + [#:local-build? #f] [#:guile-for-build #f] Return a derivation that executes Scheme expression @var{exp} as a builder for derivation @var{name}. @var{inputs} must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} is omitted, @@ -1820,8 +1821,8 @@ terminates by passing the result of @var{exp} to @code{exit}; thus, when @var{guile-for-build} is omitted or is @code{#f}, the value of the @code{%guile-for-build} fluid is used instead. -See the @code{derivation} procedure for the meaning of @var{references-graphs} -and @var{local-build?}. +See the @code{derivation} procedure for the meaning of +@var{references-graphs}, @var{allowed-references}, and @var{local-build?}. @end deffn @noindent diff --git a/guix/derivations.scm b/guix/derivations.scm index 8d0c9c08df..5ca516aa28 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -962,6 +962,7 @@ they can refer to each other." (modules '()) guile-for-build references-graphs + allowed-references local-build?) "Return a derivation that executes Scheme expression EXP as a builder for derivation NAME. INPUTS must be a list of (NAME DRV-PATH SUB-DRV) @@ -981,8 +982,8 @@ EXP returns #f, the build is considered to have failed. EXP is built using GUILE-FOR-BUILD (a derivation). When GUILE-FOR-BUILD is omitted or is #f, the value of the `%guile-for-build' fluid is used instead. -See the `derivation' procedure for the meaning of REFERENCES-GRAPHS and -LOCAL-BUILD?." +See the `derivation' procedure for the meaning of REFERENCES-GRAPHS, +ALLOWED-REFERENCES, and LOCAL-BUILD?." (define guile-drv (or guile-for-build (%guile-for-build))) @@ -1107,4 +1108,5 @@ LOCAL-BUILD?." #:recursive? recursive? #:outputs outputs #:references-graphs references-graphs + #:allowed-references allowed-references #:local-build? local-build?))) -- cgit v1.2.3