From 645b9df858683dc05ffa04c9eb2fdc45ccef4a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Oct 2016 23:40:03 +0200 Subject: guix build: Add '--with-graft'. * guix/scripts/build.scm (transform-package-inputs/graft): New procedure. (%transformations): Add 'with-graft'. (%transformation-options): Likewise. (show-transformation-options-help): Document it. * tests/scripts-build.scm ("options->transformation, with-graft"): New test. * doc/guix.texi (Package Transformation Options): Document it. --- tests/scripts-build.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests/scripts-build.scm') diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index e48c8da264..e2610904e2 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -102,4 +102,23 @@ ((("x" dep)) (eq? dep findutils))))))))))) +(test-assert "options->transformation, with-graft" + (let* ((p (dummy-package "guix.scm" + (inputs `(("foo" ,grep) + ("bar" ,(dummy-package "chbouib" + (native-inputs `(("x" ,grep))))))))) + (t (options->transformation '((with-input . "grep=findutils"))))) + (with-store store + (let ((new (t store p))) + (and (not (eq? new p)) + (match (package-inputs new) + ((("foo" dep1) ("bar" dep2)) + (and (string=? (package-full-name dep1) + (package-full-name grep)) + (eq? (package-replacement dep1) findutils) + (string=? (package-name dep2) "chbouib") + (match (package-native-inputs dep2) + ((("x" dep)) + (eq? (package-replacement dep) findutils))))))))))) + (test-end) -- cgit v1.2.3 From 0d7034ca4fa287f792a934dd3ac17905db683f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 19 Oct 2016 15:17:06 +0200 Subject: tests: Fix typo in 'with-graft' transformation test. This is a followup to 645b9df858683dc05ffa04c9eb2fdc45ccef4a65. * tests/scripts-build.scm ("options->transformation, with-graft"): Use 'with-graft', not 'with-input'. --- tests/scripts-build.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/scripts-build.scm') diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index e2610904e2..b324012806 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -107,7 +107,7 @@ (inputs `(("foo" ,grep) ("bar" ,(dummy-package "chbouib" (native-inputs `(("x" ,grep))))))))) - (t (options->transformation '((with-input . "grep=findutils"))))) + (t (options->transformation '((with-graft . "grep=findutils"))))) (with-store store (let ((new (t store p))) (and (not (eq? new p)) -- cgit v1.2.3