diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-10 00:42:22 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-10 00:42:22 -0400 |
| commit | f89aa1521af69b0e1a1350c2380579788b0f8945 (patch) | |
| tree | 5009cca687ac669ef846920877cbfb6fffdd9893 /tests/guix-package.sh | |
| parent | 169c658f7f286efae397fa3eda55b1c56fa92a01 (diff) | |
| parent | 60e1de6d95bd32b4996c199708541781b8f828fd (diff) | |
| download | patches-f89aa1521af69b0e1a1350c2380579788b0f8945.tar patches-f89aa1521af69b0e1a1350c2380579788b0f8945.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/guix-package.sh')
| -rw-r--r-- | tests/guix-package.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 760a2e4c9b..aa5eaa66e7 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -60,6 +60,14 @@ test -L "$profile" && test -L "$profile-1-link" ! test -f "$profile-2-link" test -f "$profile/bin/guile" +# Collisions are properly flagged (in this case, 'python-wrapper' propagates +# python@3, which conflicts with python@2.) +if guix package --bootstrap -n -p "$profile" -i python@2 python-wrapper +then false; else true; fi + +guix package --bootstrap -n -p "$profile" -i python@2 python-wrapper \ + --allow-collisions + # No search path env. var. here. guix package -p "$profile" --search-paths guix package -p "$profile" --search-paths | grep '^export PATH=' |