diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-06 09:07:28 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-06 09:07:28 +0100 |
| commit | 609d126e86ea7a05ab7e758fa3fd000ced005f49 (patch) | |
| tree | 9bc27e832508ae30cb75016d2d1ad789ce988c15 /tests/packages.scm | |
| parent | f0eb57b736f6fae67acbaad66a1b5e18fdfc10a0 (diff) | |
Revert "packages: 'package-grafts' trims native inputs."
This reverts commit 91c9b5d016ac8bed127557d378c70fbc56cec0e5
following the concerns raised by Mark, Ben, and Tobias:
<https://lists.gnu.org/archive/html/guix-devel/2017-12/msg00081.html>.
Diffstat (limited to 'tests/packages.scm')
| -rw-r--r-- | tests/packages.scm | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index fe7bd1ded69..930374dabfa 100644 --- a/tests/packages.scm +++ b/tests/packages.scm | |||
| @@ -660,24 +660,6 @@ | |||
| 660 | ;; (package-cross-derivation %store p "mips64el-linux-gnu" | 660 | ;; (package-cross-derivation %store p "mips64el-linux-gnu" |
| 661 | ;; #:graft? #t))) | 661 | ;; #:graft? #t))) |
| 662 | 662 | ||
| 663 | ;; It doesn't make sense for 'package-grafts' to look at native inputs since, | ||
| 664 | ;; by definition, they are not referenced at run time. Make sure | ||
| 665 | ;; 'package-grafts' respects this. | ||
| 666 | (test-equal "package-grafts, grafts of native inputs ignored" | ||
| 667 | '() | ||
| 668 | (let* ((new (dummy-package "native-dep" | ||
| 669 | (version "0.1") | ||
| 670 | (arguments '(#:implicit-inputs? #f)))) | ||
| 671 | (ndep (package (inherit new) (version "0.0") | ||
| 672 | (replacement new))) | ||
| 673 | (dep (dummy-package "dep" | ||
| 674 | (arguments '(#:implicit-inputs? #f)))) | ||
| 675 | (dummy (dummy-package "dummy" | ||
| 676 | (arguments '(#:implicit-inputs? #f)) | ||
| 677 | (native-inputs `(("ndep" ,ndep))) | ||
| 678 | (inputs `(("dep" ,dep)))))) | ||
| 679 | (package-grafts %store dummy))) | ||
| 680 | |||
| 681 | (test-assert "package-grafts, indirect grafts" | 663 | (test-assert "package-grafts, indirect grafts" |
| 682 | (let* ((new (dummy-package "dep" | 664 | (let* ((new (dummy-package "dep" |
| 683 | (arguments '(#:implicit-inputs? #f)))) | 665 | (arguments '(#:implicit-inputs? #f)))) |
