kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

pack: '-R' applies to propagated inputs too.

Browse Source 
Fixes <https://bugs.gnu.org/42510>.

* guix/scripts/pack.scm (wrapped-manifest-entry): Recurse on
'dependencies' field.
* tests/guix-pack-relocatable.sh: Add test.
This commit is contained in:
Ludovic Courtès 2020-07-24 11:27:51 +02:00 committed by Ludovic Courtès
parent 12dc9f58c4
commit a553892215
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/scripts/pack.scm
View File

@ -875,7 +875,10 @@ last resort for relocation."
(item (apply wrapped-package (item (apply wrapped-package
(manifest-entry-item entry) (manifest-entry-item entry)
(manifest-entry-output entry) (manifest-entry-output entry)
args)))) args))
(dependencies (map (lambda (entry)
(apply wrapped-manifest-entry entry args))
(manifest-entry-dependencies entry)))))
;;; ;;;

5
tests/guix-pack-relocatable.sh
View File

@ -111,3 +111,8 @@ esac
tarball="`guix pack -R -S /share=share groff:doc`" tarball="`guix pack -R -S /share=share groff:doc`"
(cd "$test_directory"; tar xvf "$tarball") (cd "$test_directory"; tar xvf "$tarball")
test -d "$test_directory/share/doc/groff/html" test -d "$test_directory/share/doc/groff/html"
# Ensure '-R' applies to propagated inputs. Failing to do that, it would fail
# with a profile collision error in this case because 'python-scipy'
# propagates 'python-numpy'. See <https://bugs.gnu.org/42510>.
guix pack -RR python-numpy python-scipy --no-grafts -n