diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-05 16:32:40 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-05 16:32:40 +0100 |
| commit | 91c9b5d016ac8bed127557d378c70fbc56cec0e5 (patch) | |
| tree | 5f2b318d1a857f647406504b69f4122f072eb34a /tests | |
| parent | f3e3f4d934ee0ecd71f5c73a57252ed1d0bad88e (diff) | |
| download | guix-91c9b5d016ac8bed127557d378c70fbc56cec0e5.tar guix-91c9b5d016ac8bed127557d378c70fbc56cec0e5.tar.gz | |
packages: 'package-grafts' trims native inputs.
'package-grafts' returns a list of potentially applicable grafts, which
'cumulative-grafts' then narrows by looking at store item references and
determining the subset of the grafts that's actually applicable.
Until now, 'package-grafts' would traverse native inputs and would thus
return a large superset of the applicable grafts, since native inputs
are not in the reference graph by definition. This patch fixes that by
having 'package-grafts' ignore entirely native inputs from the
dependency graph.
* guix/packages.scm (fold-bag-dependencies)[bag-direct-inputs*]: Add
special case for libc.
* guix/packages.scm (bag-grafts)[native-grafts, target-grafts]: Remove.
[grafts]: New procedure.
Use it.
* tests/packages.scm ("package-grafts, grafts of native inputs
ignored"): New test.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/packages.scm | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index 930374dabf..fe7bd1ded6 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -660,6 +660,24 @@ ;; (package-cross-derivation %store p "mips64el-linux-gnu" ;; #:graft? #t))) +;; It doesn't make sense for 'package-grafts' to look at native inputs since, +;; by definition, they are not referenced at run time. Make sure +;; 'package-grafts' respects this. +(test-equal "package-grafts, grafts of native inputs ignored" + '() + (let* ((new (dummy-package "native-dep" + (version "0.1") + (arguments '(#:implicit-inputs? #f)))) + (ndep (package (inherit new) (version "0.0") + (replacement new))) + (dep (dummy-package "dep" + (arguments '(#:implicit-inputs? #f)))) + (dummy (dummy-package "dummy" + (arguments '(#:implicit-inputs? #f)) + (native-inputs `(("ndep" ,ndep))) + (inputs `(("dep" ,dep)))))) + (package-grafts %store dummy))) + (test-assert "package-grafts, indirect grafts" (let* ((new (dummy-package "dep" (arguments '(#:implicit-inputs? #f)))) |