diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-06-21 16:50:59 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-06-21 16:53:22 +0200 |
commit | afd06f605bf88a796acefc7ed598b43879346a6b (patch) | |
tree | edb62a347c953146831a7d67ca21d78329855b01 /tests | |
parent | cba988ed859616f3a36f88f2984d42417447dfa1 (diff) |
environment: Disable profile collision checks.
Reported by Efraim Flashner.
This is a followup to a654dc4bcf7c8e205bdefa1a1d5f23444dd22778.
* guix/profiles.scm (profile-derivation): Add #:allow-collisions? and
honor it.
* guix/scripts/environment.scm (inputs->profile-derivation): Pass
#:allow-collisions? #f to 'profile-derivation'.
* tests/guix-environment.sh: Test "guix environment guix".
Diffstat (limited to 'tests')
-rw-r--r-- | tests/guix-environment.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index 9115949123..bf5ca17fa5 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -105,6 +105,10 @@ else test $? = 42 fi +# Make sure we can build the environment of 'guix'. There may be collisions +# in its profile (e.g., for 'gzip'), but we have to accept them. +guix environment guix --bootstrap -n + if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null then # Compute the build environment for the initial GNU Make. |