summary refs log tree commit diff
path: root/tests/derivations.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-06-13 17:21:27 +0200
committerLudovic Courtès <ludo@gnu.org>2012-06-13 17:21:27 +0200
commit2acb2cb6d006a4799ae9f477c22177824fcc8f52 (patch)
tree4a79c9dc9cde2af4e7e41280de075e12406777ce /tests/derivations.scm
parentc36db98c8eaeded5243ecfa1c66e06f38da10692 (diff)
downloadguix-2acb2cb6d006a4799ae9f477c22177824fcc8f52.tar.gz
Change `build-expression->derivation' to support sub-derivation inputs.
* guix/derivations.scm (build-expression->derivation): Change to expect
  INPUTS to have the form (NAME DRV-PATH SUB-DRV) or (NAME DRV-PATH),
  instead of (NAME . DRV-PATH).  Update callers accordingly.

* guix/gnu-build-system.scm, tests/builders.scm, tests/derivations.scm:
  Update accordingly.
Diffstat (limited to 'tests/derivations.scm')
-rw-r--r--tests/derivations.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm
index d39dacd9a0..4a81a70f65 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -211,7 +211,7 @@
                                    "uname" "-a")))))
          (drv-path   (build-expression->derivation %store "uname" (%current-system)
                                                    builder
-                                                   `(("cu" . ,%coreutils))))
+                                                   `(("cu" ,%coreutils))))
          (succeeded? (build-derivations %store (list drv-path))))
     (and succeeded?
          (let ((p (derivation-path->output-path drv-path)))