From dd1a5a152c679ba2d386dc66127a0de924182e26 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 4 Dec 2013 16:07:36 +0100 Subject: 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'. --- doc/guix.texi | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'doc') 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{} # @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} -- cgit v1.2.3 an>gnu: ugrep: Build with zstd support.kiasoc5 2022-08-05gnu: ugrep: Update to 3.8.3.kiasoc5 2022-07-08gnu: Add omega.Arun Isaac 2022-07-06gnu: fsearch: Update to 0.1.4.Nicolas Goaziou 2022-07-04gnu: fsearch: Update to 0.1.3.Nicolas Goaziou 2022-06-24gnu: Use license: prefix in (gnu packages search).Arun Isaac 2022-06-24gnu: xapian, python-xapian-bindings: Update to 1.4.19.Arun Isaac 2022-05-29gnu: perl-search-xapian: Update to 1.2.25.5.Tobias Geerinckx-Rice 2022-05-02gnu: ugrep: Update to 3.7.9.kiasoc5 2022-04-05gnu: plocate: Build with "--sharedstatedir=/var".ykonai 2022-02-15gnu: plocate: Update to 1.1.15.Jai Vetrivelan 2022-02-09gnu: searx: Fix build.kiasoc5 2022-02-07gnu: fsearch: Update to 0.1.2.Nicolas Goaziou 2022-01-24gnu: fsearch: Update to 0.1.1.Nicolas Goaziou 2021-12-21gnu: Add fsearch.Nicolas Goaziou 2021-12-13gnu: Simplify package inputs.Ludovic Courtès 2021-11-08gnu: plocate: Update to 1.1.13.Tobias Geerinckx-Rice 2021-10-29gnu: recoll: Enable GUI and add inputs for common filters.Ricardo Wurmus 2021-10-28gnu: recoll: Update synopsis.Ricardo Wurmus 2021-10-28gnu: recoll: Add home-page.Ricardo Wurmus 2021-10-28gnu: Add recoll.Ricardo Wurmus 2021-10-08gnu: plocate: Update to 1.1.12.Nicolas Goaziou 2021-10-08gnu: Add plocate.Alexandr Vityazev 2021-07-19gnu: Add searx.Vinicius Monego 2021-04-27gnu: ugrep: Use GIT-FILE-NAME helper.Tobias Geerinckx-Rice 2021-04-27gnu: ugrep: Update to 3.1.12.Tobias Geerinckx-Rice 2021-04-04gnu: ugrep: Update to 3.1.11.Tobias Geerinckx-Rice 2021-01-27gnu: Add ugrep.Hartmut Goebel 2021-01-18gnu: xapian, python-xapian-bindings: Update to 1.4.18.Tobias Geerinckx-Rice 2021-01-03gnu: perl-search-xapian: Update to 1.2.25.4.Tobias Geerinckx-Rice 2020-08-24gnu: xapian: Update to 1.4.17.Tobias Geerinckx-Rice 2020-06-14gnu: xapian: Update to 1.4.16.Tobias Geerinckx-Rice