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 /tests/store.scm | |
| parent | 7b63fa8d155310e4e66cdb2914e01557fb36f272 (diff) | |
| download | guix-dd1a5a152c679ba2d386dc66127a0de924182e26.tar 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 'tests/store.scm')
| -rw-r--r-- | tests/store.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/store.scm b/tests/store.scm index 741803884d..f1a3f160f4 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -236,12 +236,11 @@ Deriver: ~a~%" (let* ((s (open-connection)) (c (random-text)) ; contents of the output (d (build-expression->derivation - s "substitute-me" (%current-system) + s "substitute-me" `(call-with-output-file %output (lambda (p) (exit 1) ; would actually fail (display ,c p))) - '() #:guile-for-build (package-derivation s %bootstrap-guile (%current-system)))) (o (derivation->output-path d)) @@ -288,11 +287,10 @@ Deriver: ~a~%" (let* ((s (open-connection)) (t (random-text)) ; contents of the output (d (build-expression->derivation - s "substitute-me-not" (%current-system) + s "substitute-me-not" `(call-with-output-file %output (lambda (p) (display ,t p))) - '() #:guile-for-build (package-derivation s %bootstrap-guile (%current-system)))) (o (derivation->output-path d)) |