From dd6b9a3790b8d545c7254dedeb81630a6fa1d66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 24 Jan 2013 23:33:30 +0100 Subject: packages: Mark the `inputs' field of as thunked. * guix/packages.scm ()[inputs]: Mark as thunked. (package-derivation)[expand-input]: Remove case where the input is a procedure. * tests/packages.scm ("trivial with system-dependent input"): Remove `lambda', and use (%current-system). * gnu/packages/bootstrap.scm (package-from-tarball): Likewise for `inputs'. (%bootstrap-glibc, %bootstrap-gcc): Likewise. * gnu/packages/scheme.scm (mit-scheme): Likewise. --- tests/packages.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/packages.scm b/tests/packages.scm index 990deb79ef..8b0f29e6bc 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -124,9 +124,8 @@ (bash (assoc-ref %build-inputs "bash"))) (zero? (system* bash "-c" (format #f "echo hello > ~a" out)))))) - (inputs `(("bash" ,(lambda (system) - (search-bootstrap-binary "bash" - system))))))) + (inputs `(("bash" ,(search-bootstrap-binary "bash" + (%current-system))))))) (d (package-derivation %store p))) (and (build-derivations %store (list d)) (let ((p (pk 'drv d (derivation-path->output-path d)))) -- cgit v1.2.3