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 /gnu/system | |
| 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 'gnu/system')
| -rw-r--r-- | gnu/system/linux.scm | 3 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gnu/system/linux.scm b/gnu/system/linux.scm index eb3e133044..65868ce9bf 100644 --- a/gnu/system/linux.scm +++ b/gnu/system/linux.scm @@ -108,7 +108,8 @@ %build-inputs) #t))) - (derivation-expression "pam.d" (%current-system) builder (zip names files)))) + (derivation-expression "pam.d" builder + #:inputs (zip names files)))) (define %pam-other-services ;; The "other" PAM configuration, which denies everything (see diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 2413a97150..a9f157d915 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -196,7 +196,9 @@ made available under the /xchg CIFS share." ("coreutils" ,coreutils) ("builder" ,user-builder) ,@inputs)))) - (derivation-expression name system builder inputs + (derivation-expression name builder + #:system system + #:inputs inputs #:env-vars env-vars #:modules (delete-duplicates `((guix build utils) @@ -450,8 +452,9 @@ input tuples." (x (return x))) inputs)))) - (derivation-expression name system builder - inputs + (derivation-expression name builder + #:system system + #:inputs inputs #:modules '((guix build union)) #:guile-for-build guile))) |