mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
guix package: Add '--allow-collisions'.
Fixes <https://bugs.gnu.org/30830>. Suggested by Ricardo Wurmus <rekado@elephly.net>. * guix/scripts/package.scm (build-and-use-profile): Add #:allow-collisions? and pass it to 'profile-derivation'. (show-help, %options): Add '--allow-collisions'. (manifest-action, process-actions): Pass #:allow-collisions? to 'build-and-use-profile'. * tests/guix-package.sh: Add collision test. * doc/guix.texi (Invoking guix package): Document '--allow-collisions'.
This commit is contained in:
parent
e1bff5a75c
commit
fc95dc4c34
3 changed files with 33 additions and 2 deletions
|
@ -2039,6 +2039,16 @@ variable, even though, taken individually, neither @file{foo} nor
|
|||
@itemx -p @var{profile}
|
||||
Use @var{profile} instead of the user's default profile.
|
||||
|
||||
@cindex collisions, in a profile
|
||||
@cindex colliding packages in profiles
|
||||
@cindex profile collisions
|
||||
@item --allow-collisions
|
||||
Allow colliding packages in the new profile. Use at your own risk!
|
||||
|
||||
By default, @command{guix package} reports as an error @dfn{collisions}
|
||||
in the profile. Collisions happen when two or more different versions
|
||||
or variants of a given package end up in the profile.
|
||||
|
||||
@item --verbose
|
||||
Produce verbose output. In particular, emit the build log of the
|
||||
environment on the standard error port.
|
||||
|
|
|
@ -194,15 +194,18 @@ (define (delete-matching-generations store profile pattern)
|
|||
|
||||
(define* (build-and-use-profile store profile manifest
|
||||
#:key
|
||||
allow-collisions?
|
||||
bootstrap? use-substitutes?
|
||||
dry-run?)
|
||||
"Build a new generation of PROFILE, a file name, using the packages
|
||||
specified in MANIFEST, a manifest object."
|
||||
specified in MANIFEST, a manifest object. When ALLOW-COLLISIONS? is true,
|
||||
do not treat collisions in MANIFEST as an error."
|
||||
(when (equal? profile %current-profile)
|
||||
(ensure-default-profile))
|
||||
|
||||
(let* ((prof-drv (run-with-store store
|
||||
(profile-derivation manifest
|
||||
#:allow-collisions? allow-collisions?
|
||||
#:hooks (if bootstrap?
|
||||
'()
|
||||
%default-profile-hooks)
|
||||
|
@ -407,6 +410,8 @@ (define (show-help)
|
|||
(display (G_ "
|
||||
-p, --profile=PROFILE use PROFILE instead of the user's default profile"))
|
||||
(newline)
|
||||
(display (G_ "
|
||||
--allow-collisions do not treat collisions in the profile as an error"))
|
||||
(display (G_ "
|
||||
--bootstrap use the bootstrap Guile to build the profile"))
|
||||
(display (G_ "
|
||||
|
@ -544,6 +549,10 @@ (define %options
|
|||
(lambda (opt name arg result arg-handler)
|
||||
(values (alist-cons 'verbose? #t result)
|
||||
#f)))
|
||||
(option '("allow-collisions") #f #f
|
||||
(lambda (opt name arg result arg-handler)
|
||||
(values (alist-cons 'allow-collisions? #t result)
|
||||
#f)))
|
||||
(option '(#\s "search") #t #f
|
||||
(lambda (opt name arg result arg-handler)
|
||||
(values (cons `(query search ,(or arg ""))
|
||||
|
@ -831,13 +840,15 @@ (define* (manifest-action store profile file opts
|
|||
(let* ((user-module (make-user-module '((guix profiles) (gnu))))
|
||||
(manifest (load* file user-module))
|
||||
(bootstrap? (assoc-ref opts 'bootstrap?))
|
||||
(substitutes? (assoc-ref opts 'substitutes?)))
|
||||
(substitutes? (assoc-ref opts 'substitutes?))
|
||||
(allow-collisions? (assoc-ref opts 'allow-collisions?)))
|
||||
(if dry-run?
|
||||
(format #t (G_ "would install new manifest from '~a' with ~d entries~%")
|
||||
file (length (manifest-entries manifest)))
|
||||
(format #t (G_ "installing new manifest from '~a' with ~d entries~%")
|
||||
file (length (manifest-entries manifest))))
|
||||
(build-and-use-profile store profile manifest
|
||||
#:allow-collisions? allow-collisions?
|
||||
#:bootstrap? bootstrap?
|
||||
#:use-substitutes? substitutes?
|
||||
#:dry-run? dry-run?)))
|
||||
|
@ -856,6 +867,7 @@ (define (process-actions store opts)
|
|||
(define dry-run? (assoc-ref opts 'dry-run?))
|
||||
(define bootstrap? (assoc-ref opts 'bootstrap?))
|
||||
(define substitutes? (assoc-ref opts 'substitutes?))
|
||||
(define allow-collisions? (assoc-ref opts 'allow-collisions?))
|
||||
(define profile (or (assoc-ref opts 'profile) %current-profile))
|
||||
(define transform (options->transformation opts))
|
||||
|
||||
|
@ -894,6 +906,7 @@ (define (transform-entry entry)
|
|||
(show-manifest-transaction store manifest step3
|
||||
#:dry-run? dry-run?)
|
||||
(build-and-use-profile store profile new
|
||||
#:allow-collisions? allow-collisions?
|
||||
#:bootstrap? bootstrap?
|
||||
#:use-substitutes? substitutes?
|
||||
#:dry-run? dry-run?))))
|
||||
|
|
|
@ -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='
|
||||
|
|
Loading…
Reference in a new issue