From 2acb2cb6d006a4799ae9f477c22177824fcc8f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Jun 2012 17:21:27 +0200 Subject: 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. --- tests/builders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/builders.scm') diff --git a/tests/builders.scm b/tests/builders.scm index c68f1ffe8d..851baa9ebf 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -47,7 +47,7 @@ "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6")) (tarball (http-fetch %store url 'sha256 hash)) (build (gnu-build %store "hello-2.8" tarball - `(("gawk" . ,(nixpkgs-derivation "gawk")))))) + `(("gawk" ,(nixpkgs-derivation "gawk")))))) (and (build-derivations %store (list (pk 'hello-drv build))) (file-exists? (string-append (derivation-path->output-path build) "/bin/hello"))))) -- cgit v1.2.3