summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-06-21 16:50:59 +0200
committerLudovic Courtès <ludo@gnu.org>2017-06-21 16:53:22 +0200
commitafd06f605bf88a796acefc7ed598b43879346a6b (patch)
treeedb62a347c953146831a7d67ca21d78329855b01 /guix/scripts
parentcba988ed859616f3a36f88f2984d42417447dfa1 (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 'guix/scripts')
-rw-r--r--guix/scripts/environment.scm7
1 files changed, 7 insertions, 0 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index af69e2b730..0abc509a35 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -323,6 +323,13 @@ BOOTSTRAP? specifies whether to use the bootstrap Guile to build the
profile."
(profile-derivation (packages->manifest inputs)
#:system system
+
+ ;; Packages can have conflicting inputs, or explicit
+ ;; inputs that conflict with implicit inputs (e.g., gcc,
+ ;; gzip, etc.). Thus, do not error out when we
+ ;; encounter collision.
+ #:allow-collisions? #t
+
#:hooks (if bootstrap?
'()
%default-profile-hooks)