From patchwork Fri Aug 6 18:57:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 31865 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 15C7127BC78; Fri, 6 Aug 2021 19:58:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, 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 CA1E627BC6B for ; Fri, 6 Aug 2021 19:58:09 +0100 (BST) Received: from localhost ([::1]:59044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC52m-000674-UR for patchwork@mira.cbaines.net; Fri, 06 Aug 2021 14:58:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC52f-00066k-Tf for guix-patches@gnu.org; Fri, 06 Aug 2021 14:58:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mC52f-0003C7-LA for guix-patches@gnu.org; Fri, 06 Aug 2021 14:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mC52f-00024C-KH for guix-patches@gnu.org; Fri, 06 Aug 2021 14:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49915] [PATCH 2/3] gnu: go-github-com-mattn-go-shellwords: Fix sh path. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Aug 2021 18:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49915@debbugs.gnu.org Received: via spool by 49915-submit@debbugs.gnu.org id=B49915.16282762627905 (code B ref 49915); Fri, 06 Aug 2021 18:58:01 +0000 Received: (at 49915) by debbugs.gnu.org; 6 Aug 2021 18:57:42 +0000 Received: from localhost ([127.0.0.1]:51370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mC52M-00023R-GG for submit@debbugs.gnu.org; Fri, 06 Aug 2021 14:57:42 -0400 Received: from out1.migadu.com ([91.121.223.63]:48159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mC52J-00023H-Ry for 49915@debbugs.gnu.org; Fri, 06 Aug 2021 14:57:40 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628276258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eSJH0UNN1vkoH8N3RFHjmlFw2SbTZlU4WYq046MxZoo=; b=ZjFlJmSdfTaR/6PD96ziNF+mlVByGb2F5PE5jVO5f/Aqad3BANWHMWeR7NhKbfYaWiDpKP ndLRpTqe9uqUX6sXWIG7WqeyJkATC77DRsGdSYYAwvpC3WuRUtzqHxyZj3FgMmhRfc+Rpv gf9OKMkWtVPorGc5RFLOdSBPOOfjt04= From: Sarah Morgensen Date: Fri, 6 Aug 2021 11:57:36 -0700 Message-Id: <291625dd0fc68e516af6d6707fe37ab6f8c86b6c.1628275842.git.iskarian@mgsn.dev> In-Reply-To: <38f52b13a45c8e0792433861748499f1f5638cf7.1628275842.git.iskarian@mgsn.dev> References: <38f52b13a45c8e0792433861748499f1f5638cf7.1628275842.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-mattn-go-shellwords)[arguments] <#:phases>{patch-sh-path}: New phase. [inputs]: Add bash. --- gnu/packages/golang.scm | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c32324f235..b46f9e9bbf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module ((gnu packages bootstrap) #:select (glibc-dynamic-linker)) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -5273,24 +5274,14 @@ systems.") (build-system go-build-system) (arguments `(#:import-path "github.com/mattn/go-shellwords" - ;; TODO: can't make homeless-shelter: - ;; go: disabling cache (/homeless-shelter/.cache/go-build) due to - ;; initialization failure: mkdir /homeless-shelter: permission denied - - ;; This doesn't seem to work: - - ;; #:phases - ;; (modify-phases %standard-phases - ;; (replace 'check - ;; (lambda* (#:key import-path #:allow-other-keys) - ;; (setenv "HOME" "/tmp") - ;; (invoke "go" "test" import-path)))) - - ;; TODO: There are also a couple of tests that have stymied Debian in - ;; the past. They seem to work when run locally. - #:tests? #f - )) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sh-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/github.com/mattn/go-shellwords/util_posix.go" + (("/bin/sh") (which "sh")))))))) + (inputs `(("bash" ,bash))) (home-page "https://github.com/mattn/go-shellwords") (synopsis "Parse lines into shell words") (description "This package parses text into shell arguments. Based on