--- Begin Message ---
Subject: |
[PATCH] scripts: Expose 'allow-collisions' for 'guix upgrade' |
Date: |
Wed, 1 Mar 2023 22:49:30 -0800 |
* guix/scripts/install.scm: Expose 'allow-collisions' option of 'package'
for 'upgrade' alias
---
guix/scripts/upgrade.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm
index beb59cbe6f..423760a93b 100644
--- a/guix/scripts/upgrade.scm
+++ b/guix/scripts/upgrade.scm
@@ -36,6 +36,8 @@ (define (show-help)
This is an alias for 'guix package -u'.\n"))
(display (G_ "
-p, --profile=PROFILE use PROFILE instead of the user's default profile"))
+ (display (G_ "
+ --allow-collisions do not treat collisions in the profile as an error"))
(display (G_ "
-v, --verbosity=LEVEL use the given verbosity LEVEL"))
(display (G_ "
@@ -65,7 +67,8 @@ (define %options
;; Preserve some of the 'guix package' options.
(append (filter (lambda (option)
(any (cut member <> (option-names option))
- '("profile" "dry-run" "verbosity"
"do-not-upgrade")))
+ '("profile" "dry-run" "verbosity"
"do-not-upgrade"
+ "allow-collisions")))
%package-options)
%transformation-options
base-commit: ef7df2ca7bb212455f1d6bbef5bbf7b1ac5a189d
prerequisite-patch-id: 5c2c505e1fefe02b0b8fe068d673dcc8fcc8b246
prerequisite-patch-id: b3de9e1babefba1a1903b848f185b9f8bcb224f4
prerequisite-patch-id: d827e9c76e13bae69214ec1b674b0f6bfc4bfb34
--
2.39.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#61907] [PATCH] scripts: Expose 'allow-collisions' for 'guix upgrade' |
Date: |
Wed, 17 May 2023 23:17:42 +0200 |
Hi Andy and Simon,
Simon Tournier <zimon.toutoune@gmail.com> writes:
> Hi,
>
> On Wed, 01 Mar 2023 at 22:49, Andy Tai <atai@atai.org> wrote:
>> * guix/scripts/install.scm: Expose 'allow-collisions' option of 'package'
>> for 'upgrade' alias
>
> I would apply the same explanation as Leo in [1] for #61864,
>
> [PATCH] scripts: expose 'allow-collisions' for 'guix install'
>
> 1: http://issues.guix.gnu.org/msgid/ZChh1GFQnKRBITmL@jasmine.lan
I agree. Closing, but feel free to continue the discussion.
Best,
--
Josselin Poiret
signature.asc
Description: PGP signature
--- End Message ---