From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YIPGDz+GDWEJwAAAgWs5BA (envelope-from ) for ; Fri, 06 Aug 2021 20:58:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id OPVdCz+GDWFyGAAAB5/wlQ (envelope-from ) for ; Fri, 06 Aug 2021 18:58:07 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EBD6249FB for ; Fri, 6 Aug 2021 20:58:06 +0200 (CEST) Received: from localhost ([::1]:59044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC52k-000674-5h for larch@yhetil.org; Fri, 06 Aug 2021 14:58:06 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628276287; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=eSJH0UNN1vkoH8N3RFHjmlFw2SbTZlU4WYq046MxZoo=; b=DRKp90CSgR86Lf3Soko9Y0a+Y9LRbdrbpiwCPmTiV0qA9kzUnR8ui9e5gB23JvoespDIbZ 5E+pc907q/ZiCQMEiCKSN+cFIzlhfrw08QTiZZ+pBFjk6HaNrxr6E3pCvcUEZp173Xro+A QOIuMxxLLiHpHBG12Kfgiyymzq4syNUrwFEQbRV2oyEYD+Pk3fcFKQyWUMzj1HAhKi6+hW X9uibDoChpg0ix4QhEey7z6VpB2p0SYNV02DFpQ7hEkjs1ZFiNQfgQteb4NqmrQO7+1cOz h1MSSDzRN03Zs2suOqzRInnPOCzNVILem0M3ufwbXDHGzSmcQm2KHxrHDvTjgw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628276287; a=rsa-sha256; cv=none; b=b2E8LykRyxHacoj2cNCh4xsfAqsnLN6HClij9bL7QbOxpQx+dqbyKUBaGQNrUdbmJbZQt/ vbk+SdkLyt4aKGmhieGoOl/58vBtF5otzy9YBx298fG7i+wupWkkGxwQjkFi9nEwxH8fjq C+GjqO6KnrlKy6i3JgcgQ8Mshg6vFTofD77mvpfjqtLmoN6jgq+2b4Bwk4OH69rEz0FFCp bxy+Qf63upZCKiW9V1OrLPqrRwCIE4gaHh2OccvLKkfG1E9RFdQbF2wJX145CLctCveNol uJLNhYjHzNOrOewYjRjuPqYUcnrfrGdW4Bohrs+y9kclQKg6Vi7QkYaP1fKT9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=ZjFlJmSd; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=ZjFlJmSd; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: EBD6249FB X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: lFkiuaPHx6s0 * 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 -- 2.31.1