From patchwork Fri Mar 3 06:07:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47558 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7AFFE16D17; Fri, 3 Mar 2023 06:08:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7509B16D0C for ; Fri, 3 Mar 2023 06:08:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXyaK-0007TS-P2; Fri, 03 Mar 2023 01:08:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXyaI-0007TI-O5 for guix-patches@gnu.org; Fri, 03 Mar 2023 01:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXyaI-0003k4-Cj for guix-patches@gnu.org; Fri, 03 Mar 2023 01:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXyaH-0008Kk-Ni for guix-patches@gnu.org; Fri, 03 Mar 2023 01:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61864] [PATCH v2] scripts: Expose 'allow-collisions' for 'guix install' References: <20230228062846.19516-1-atai@atai.org> In-Reply-To: <20230228062846.19516-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2023 06:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61864@debbugs.gnu.org Cc: Andy Tai Received: via spool by 61864-submit@debbugs.gnu.org id=B61864.167782366432012 (code B ref 61864); Fri, 03 Mar 2023 06:08:01 +0000 Received: (at 61864) by debbugs.gnu.org; 3 Mar 2023 06:07:44 +0000 Received: from localhost ([127.0.0.1]:59443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXya0-0008KF-IW for submit@debbugs.gnu.org; Fri, 03 Mar 2023 01:07:44 -0500 Received: from mail-pj1-f41.google.com ([209.85.216.41]:37852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXyZy-0008K1-BY for 61864@debbugs.gnu.org; Fri, 03 Mar 2023 01:07:42 -0500 Received: by mail-pj1-f41.google.com with SMTP id me6-20020a17090b17c600b0023816b0c7ceso5132257pjb.2 for <61864@debbugs.gnu.org>; Thu, 02 Mar 2023 22:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677823656; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=iz9qeawVR7ygffprXJprwVDdzAMg3F/NRssx9CiqZeE=; b=H2lSN+O9PFjYNZlwcng3w5OvwBoeLvT10OP1wCCaEGst0Fmi4r7gbjUo5UAICU8TzA NVH22y1TeqBTmej34p8zKGCSr3A8ceRm+xWiUL+qQpKa5xF6irg7tqPErh+FDiH6dL23 VDTy1L0dzTy47ymt/WJZ4biINMqm8o8yO8FRifw6SJ4VOJSr/gSKeab+QVkknNEIegSs y1q1dxc/Cp9lCMZ4nd5U15/CjygxboidSKXk9RkE/+/3h57H9mdSE3Z8AFWYrQFAnVVk XEDznhjhL3XNKbFu9P8dRTzwoJvsRKelXlh03WQ36lYnYiZm7MNQEJA3vJR/1mOzVZKF vN+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677823656; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iz9qeawVR7ygffprXJprwVDdzAMg3F/NRssx9CiqZeE=; b=xzMjUDGwkCUMmRMHeuO7IZyKbt/qooj0DClIGPVa6Xvg7E0KD9rcyRNSRXelpJDmQI fiUarDwRCDrv7P1S+crxb6CA+4zLEtUDk4Tnu829beNdJAp2C+OY6EetZ9XS9yEGFMe9 XSSdC6NkDVztUZaJZ6DxtBAONYL4K5K/wA6xCOXM8guELzTVWdhwWor8tlVFb154nTfu hxHyGsb6O+x9qRjNYzeYsas8I2a2F++E4D2SIwbxCCr1Z/VJ09A2Ki+gUJYWZR5vSpg9 1fq+HCDHsEFCEsNH42osg891c2Ft3pKScWGgceu+GYH6rnnZOcHEb1Fg7pf9RnhxcYdE fH4A== X-Gm-Message-State: AO0yUKVadP9VNfaIivGcQON1DoWw6LMCa1skf4VBuUX7G1x5x7Qy6WaQ Z/e81/4aDlpdaxnpJsVS0HFrJF91I3s= X-Google-Smtp-Source: AK7set9icVauWL0s3VOMgVPx1VdvHmpUGh27F4YZUUh4fu0pl1B4OXnwZjGEG29/e1A7RuZChqwfvw== X-Received: by 2002:a17:90b:3ec3:b0:237:ae7c:1594 with SMTP id rm3-20020a17090b3ec300b00237ae7c1594mr590900pjb.8.1677823656019; Thu, 02 Mar 2023 22:07:36 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id y20-20020a17090aca9400b0023317104415sm2550517pjt.17.2023.03.02.22.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 22:07:35 -0800 (PST) From: Andy Tai Date: Thu, 2 Mar 2023 22:07:32 -0800 Message-Id: <20230303060732.24744-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/install.scm: Expose 'allow-collisions' option of 'package' for 'install' alias --- guix/scripts/install.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: ea870a70e93e7ea93e35fa8e0afc3cfdb1b66ba2 diff --git a/guix/scripts/install.scm b/guix/scripts/install.scm index 63e625f266..4ab64b5b54 100644 --- a/guix/scripts/install.scm +++ b/guix/scripts/install.scm @@ -34,6 +34,8 @@ (define (show-help) (display (G_ " -p, --profile=PROFILE use PROFILE instead of the user's default profile")) ;; '--bootstrap' not shown here. + (display (G_ " + --allow-collisions do not treat collisions in the profile as an error")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) @@ -61,7 +63,8 @@ (define %options ;; Preserve some of the 'guix package' options. (append (filter (lambda (option) (any (cut member <> (option-names option)) - '("profile" "dry-run" "verbosity" "bootstrap"))) + '("profile" "dry-run" "verbosity" "bootstrap" + "allow-collisions"))) %package-options) %transformation-options