diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-12-04 16:07:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-12-04 16:07:53 +0100 |
| commit | dd1a5a152c679ba2d386dc66127a0de924182e26 (patch) | |
| tree | db197f2ae1f1655c87a93f3313b9185aa8d36d32 /doc | |
| parent | 7b63fa8d155310e4e66cdb2914e01557fb36f272 (diff) | |
| download | gnu-guix-dd1a5a152c679ba2d386dc66127a0de924182e26.tar gnu-guix-dd1a5a152c679ba2d386dc66127a0de924182e26.tar.gz | |
derivations: Use more keyword parameters for 'build-expression->derivation'.
* guix/derivations.scm (build-expression->derivation): Turn 'system' and
'inputs' into keyword parameters.
Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
guix/build-system/gnu.scm, guix/build-system/perl.scm,
guix/build-system/python.scm, guix/build-system/trivial.scm,
guix/download.scm, guix/packages.scm, guix/profiles.scm,
guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
'build-expression->derivation' and 'derivation-expression'
accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
documentation accordingly.
(The Store Monad): Likewise for 'derivation-expression'.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index eadca0fc2d..64ddb8539e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1246,7 +1246,12 @@ As can be guessed, this primitive is cumbersome to use directly. An improved variant is @code{build-expression->derivation}, which allows the caller to directly pass a Guile expression as the build script: -@deffn {Scheme Procedure} build-expression->derivation @var{store} @var{name} @var{system} @var{exp} @var{inputs} [#:outputs '("out")] [#:hash #f] [#:hash-algo #f] [#:env-vars '()] [#:modules '()] [#:references-graphs #f] [#:guile-for-build #f] +@deffn {Scheme Procedure} build-expression->derivation @var{store} @ + @var{name} @var{exp} @ + [#:system (%current-system)] [#:inputs '()] @ + [#:outputs '("out")] [#:hash #f] [#:hash-algo #f] @ + [#:env-vars '()] [#:modules '()] @ + [#:references-graphs #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, @@ -1281,8 +1286,7 @@ containing one file: (call-with-output-file (string-append out "/test") (lambda (p) (display '(hello guix) p)))))) - (build-expression->derivation store "goo" (%current-system) - builder '())) + (build-expression->derivation store "goo" builder)) @result{} #<derivation /nix/store/@dots{}-goo.drv => @dots{}> @end lisp @@ -1425,8 +1429,9 @@ directory of @var{package}. When @var{file} is omitted, return the name of the @var{output} directory of @var{package}. @end deffn -@deffn {Monadic Procedure} derivation-expression @var{name} @var{system} @ - @var{exp} @var{inputs} [#:outputs '("out")] [#:hash #f] @ +@deffn {Monadic Procedure} derivation-expression @var{name} @var{exp} @ + [#:system (%current-system)] [#:inputs '()] @ + [#:outputs '("out")] [#:hash #f] @ [#:hash-algo #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:guile-for-build #f] Monadic version of @code{build-expression->derivation} |