Browse Source

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

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

* guix/scripts/pack.scm (wrapped-manifest-entry): Recurse on
'dependencies' field.
* tests/guix-pack-relocatable.sh: Add test.
gn-latest-20200725
Ludovic Courtès 7 months ago
committed by Ludovic Courtès
parent
commit
a553892215
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
2 changed files with 9 additions and 1 deletions
  1. +4
    -1
      guix/scripts/pack.scm
  2. +5
    -0
      tests/guix-pack-relocatable.sh

+ 4
- 1
guix/scripts/pack.scm View File

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

;;;


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

@@ -111,3 +111,8 @@ esac
tarball="`guix pack -R -S /share=share groff:doc`"
(cd "$test_directory"; tar xvf "$tarball")
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

Loading…
Cancel
Save