From patchwork Tue Jan 19 18:25:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 26502 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 133CD27BC15; Tue, 19 Jan 2021 19:03:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCFC627BC14 for ; Tue, 19 Jan 2021 19:03:44 +0000 (GMT) Received: from localhost ([::1]:44146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1wI3-00043J-Sy for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 14:03:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1viY-0004lV-Ci for guix-patches@gnu.org; Tue, 19 Jan 2021 13:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1viY-0000JK-3K for guix-patches@gnu.org; Tue, 19 Jan 2021 13:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1viY-0005Tb-0A for guix-patches@gnu.org; Tue, 19 Jan 2021 13:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45989] [PATCH 1/2] gnu: python-invoke: Patch reference to bash. References: <20210119182257.15116-1-tanguy@bioneland.org> In-Reply-To: <20210119182257.15116-1-tanguy@bioneland.org> Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 18:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45989@debbugs.gnu.org Received: via spool by 45989-submit@debbugs.gnu.org id=B45989.161108076320944 (code B ref 45989); Tue, 19 Jan 2021 18:27:01 +0000 Received: (at 45989) by debbugs.gnu.org; 19 Jan 2021 18:26:03 +0000 Received: from localhost ([127.0.0.1]:51685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1vhb-0005Rk-CR for submit@debbugs.gnu.org; Tue, 19 Jan 2021 13:26:03 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:57337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1vha-0005Qp-9z for 45989@debbugs.gnu.org; Tue, 19 Jan 2021 13:26:02 -0500 X-Originating-IP: 176.185.184.238 Received: from localhost.localdomain (static-176-185-184-238.axione.abo.bbox.fr [176.185.184.238]) (Authenticated sender: tanguy@bioneland.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 7976BFF804; Tue, 19 Jan 2021 18:25:55 +0000 (UTC) From: Tanguy Le Carrour Date: Tue, 19 Jan 2021 19:25:41 +0100 Message-Id: <20210119182542.16812-1-tanguy@bioneland.org> X-Mailer: git-send-email 2.30.0 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: , Cc: Tanguy Le Carrour Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-invoke)[arguments]: Patch the reference to 'bash' in the source. [inputs]: Add bash. --- gnu/packages/python-xyz.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d08e23936c..de36222bba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15129,7 +15129,19 @@ projects.") (build-system python-build-system) (arguments ;; XXX: Requires many dependencies that are not yet in Guix. - `(#:tests? #f)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-bash-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "invoke/config.py" + (("shell = \"/bin/bash\"") + (string-append "shell = \"" bash "/bin/bash\"")) + ) + #t)))))) + (inputs + `(("bash" ,bash-minimal))) (synopsis "Pythonic task execution") (description "Invoke is a Python task execution tool and library, drawing inspiration From patchwork Tue Jan 19 18:25:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 26504 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 E508827BC15; Tue, 19 Jan 2021 19:24:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A0A9227BC14 for ; Tue, 19 Jan 2021 19:24:37 +0000 (GMT) Received: from localhost ([::1]:43100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1wcG-0007n2-Oo for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 14:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1viY-0004lz-NK for guix-patches@gnu.org; Tue, 19 Jan 2021 13:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1viY-0000JQ-Fz for guix-patches@gnu.org; Tue, 19 Jan 2021 13:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1viY-0005Tj-Cg for guix-patches@gnu.org; Tue, 19 Jan 2021 13:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45989] [PATCH 2/2] gnu: python-invoke: Update to 1.5.0. Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 18:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45989@debbugs.gnu.org Received: via spool by 45989-submit@debbugs.gnu.org id=B45989.161108076820963 (code B ref 45989); Tue, 19 Jan 2021 18:27:02 +0000 Received: (at 45989) by debbugs.gnu.org; 19 Jan 2021 18:26:08 +0000 Received: from localhost ([127.0.0.1]:51688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1vhf-0005S3-LS for submit@debbugs.gnu.org; Tue, 19 Jan 2021 13:26:07 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:38991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1vhe-0005Qv-7O for 45989@debbugs.gnu.org; Tue, 19 Jan 2021 13:26:06 -0500 X-Originating-IP: 176.185.184.238 Received: from localhost.localdomain (static-176-185-184-238.axione.abo.bbox.fr [176.185.184.238]) (Authenticated sender: tanguy@bioneland.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 6D729FF808; Tue, 19 Jan 2021 18:26:00 +0000 (UTC) From: Tanguy Le Carrour Date: Tue, 19 Jan 2021 19:25:42 +0100 Message-Id: <20210119182542.16812-2-tanguy@bioneland.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210119182542.16812-1-tanguy@bioneland.org> References: <20210119182542.16812-1-tanguy@bioneland.org> 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: , Cc: Tanguy Le Carrour Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-invoke): Update to 1.5.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index de36222bba..3f83c877b4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15119,13 +15119,13 @@ projects.") (package (name "python-invoke") (home-page "https://www.pyinvoke.org/") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "invoke" version)) (sha256 (base32 - "0pg1lpl4583z83i12262v72y1a4cxdcxi7vqhl8dpqv9wszj6gyy")))) + "0l16v7zcbgi36z6pvmdrs5q4ks8lalcafi5d9nhrpcjzbc3n1igh")))) (build-system python-build-system) (arguments ;; XXX: Requires many dependencies that are not yet in Guix.