From unknown Sun Aug 17 10:21:09 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#35386] [PATCH] gnu: direnv: Change to the go-build-system. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Apr 2019 23:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35386@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155597745323884 (code B ref -1); Mon, 22 Apr 2019 23:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Apr 2019 23:57:33 +0000 Received: from localhost ([127.0.0.1]:51926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIioX-0006DA-3R for submit@debbugs.gnu.org; Mon, 22 Apr 2019 19:57:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIioV-0006Cx-Q2 for submit@debbugs.gnu.org; Mon, 22 Apr 2019 19:57:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:42426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIioQ-00013N-Ey for submit@debbugs.gnu.org; Mon, 22 Apr 2019 19:57:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIioO-0006tS-K7 for guix-patches@gnu.org; Mon, 22 Apr 2019 19:57:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIioN-0000zl-5Y for guix-patches@gnu.org; Mon, 22 Apr 2019 19:57:24 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIioM-0000yw-Tj for guix-patches@gnu.org; Mon, 22 Apr 2019 19:57:23 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 87D1B16EE9 for ; Tue, 23 Apr 2019 00:57:20 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 46eea4b2 for ; Mon, 22 Apr 2019 23:57:19 +0000 (UTC) From: Christopher Baines Date: Tue, 23 Apr 2019 00:57:19 +0100 Message-Id: <20190422235719.5427-1-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.71.252.8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) The go-build-system is slightly more appropriate, and switching resolves = an issue with combining the 'unpack phase from the gnu-build-system, and the 'setup-go-environment from the go-build-system. With both of those phases creating a directory, the first-subdirectory call at the end of the 'unpa= ck phase can return different values depending on the filesystem ordering. * gnu/packages/shellutils.scm (direnv)[source]: Use the git repository, a= s this works better with the go-build-system. [build-system]: Change to the go-build-system. [arguments]: Adjust for the go-build-system. [native-inputs]: Remove go. --- gnu/packages/shellutils.scm | 51 ++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 59a8b744eb..56359ce160 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -105,35 +105,40 @@ are already there.") (name "direnv") (version "2.15.2") (source - (origin (method url-fetch) - (uri (string-append "https://github.com/direnv/" name - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/direnv/direnv.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hhmc6rb7b1d4s4kgb4blrq35h388ax37ap88dq3dgfcw9w6j1rm")))= ) - (build-system gnu-build-system) + "1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w")))= ) + (build-system go-build-system) (arguments - `(#:test-target "test" - #:make-flags (list (string-append "DESTDIR=3D" (assoc-ref %output= s "out"))) - #:modules ((guix build gnu-build-system) - ((guix build go-build-system) #:prefix go:) - (guix build union) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build union) - (guix build go-build-system)) + '(#:import-path "github.com/direnv/direnv" #:phases (modify-phases %standard-phases - (delete 'configure) - ;; Help the build scripts find the Go language dependencies. - (add-before 'unpack 'setup-go-environment - (assoc-ref go:%standard-phases 'setup-go-environment)) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + (add-after 'unpack 'delete-vendor + (lambda _ + ;; Using a snippet causes issues with the name of the direc= tory, + ;; so delete the extra source code here. + (delete-file-recursively "src/github.com/direnv/direnv/vend= or") + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (with-directory-excursion "src/github.com/direnv/direnv" + ;; The following file needs to be writable so it can be + ;; modified by the testsuite. + (make-file-writable "test/scenarios/base/.envrc") + (invoke "make" "test") + ;; Clean up from the tests, especially so that the extr= a + ;; direnv executable that's generated is removed. + (invoke "make" "clean"))) + #t))))) (native-inputs - `(("go" ,go) - ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) + `(("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv= ) ("which" ,which))) (home-page "https://direnv.net/") --=20 2.21.0 From unknown Sun Aug 17 10:21:09 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#35386] [PATCH] gnu: direnv: Change to the go-build-system. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Apr 2019 08:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 35386@debbugs.gnu.org Received: via spool by 35386-submit@debbugs.gnu.org id=B35386.15565247453089 (code B ref 35386); Mon, 29 Apr 2019 08:00:02 +0000 Received: (at 35386) by debbugs.gnu.org; 29 Apr 2019 07:59:05 +0000 Received: from localhost ([127.0.0.1]:38357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hL1Bo-0000nk-1c for submit@debbugs.gnu.org; Mon, 29 Apr 2019 03:59:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hL1Bm-0000nF-2F for 35386@debbugs.gnu.org; Mon, 29 Apr 2019 03:59:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL1Bg-0006RY-GP; Mon, 29 Apr 2019 03:58:56 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=48486 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hL1Bf-0006i9-Ko; Mon, 29 Apr 2019 03:58:56 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20190422235719.5427-1-mail@cbaines.net> Date: Mon, 29 Apr 2019 09:58:54 +0200 In-Reply-To: <20190422235719.5427-1-mail@cbaines.net> (Christopher Baines's message of "Tue, 23 Apr 2019 00:57:19 +0100") Message-ID: <87pnp5i6o1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Chris, Christopher Baines skribis: > The go-build-system is slightly more appropriate, and switching resolves = an > issue with combining the 'unpack phase from the gnu-build-system, and the > 'setup-go-environment from the go-build-system. With both of those phases > creating a directory, the first-subdirectory call at the end of the 'unpa= ck > phase can return different values depending on the filesystem ordering. > > * gnu/packages/shellutils.scm (direnv)[source]: Use the git repository, as > this works better with the go-build-system. > [build-system]: Change to the go-build-system. > [arguments]: Adjust for the go-build-system. > [native-inputs]: Remove go. It does look a bit nicer this way, go for it! Thanks, Ludo=E2=80=99. From unknown Sun Aug 17 10:21:09 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#35386: closed (Re: [bug#35386] [PATCH] gnu: direnv: Change to the go-build-system.) Message-ID: References: <87y33sr41u.fsf@cbaines.net> <20190422235719.5427-1-mail@cbaines.net> X-Gnu-PR-Message: they-closed 35386 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 35386@debbugs.gnu.org Date: Mon, 29 Apr 2019 19:44:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1556567042-23604-1" This is a multi-part message in MIME format... ------------=_1556567042-23604-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #35386: [PATCH] gnu: direnv: Change to the go-build-system. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 35386@debbugs.gnu.org. --=20 35386: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D35386 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1556567042-23604-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 35386-done) by debbugs.gnu.org; 29 Apr 2019 19:43:02 +0000 Received: from localhost ([127.0.0.1]:39786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hLCB4-00067E-B7 for submit@debbugs.gnu.org; Mon, 29 Apr 2019 15:43:02 -0400 Received: from mira.cbaines.net ([212.71.252.8]:55256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hLCB2-00066z-Hp for 35386-done@debbugs.gnu.org; Mon, 29 Apr 2019 15:43:01 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 125AB16F67; Mon, 29 Apr 2019 20:42:59 +0100 (BST) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 591218fc; Mon, 29 Apr 2019 19:42:58 +0000 (UTC) References: <20190422235719.5427-1-mail@cbaines.net> <87pnp5i6o1.fsf@gnu.org> User-agent: mu4e 1.0; emacs 26.1 From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#35386] [PATCH] gnu: direnv: Change to the go-build-system. In-reply-to: <87pnp5i6o1.fsf@gnu.org> Date: Mon, 29 Apr 2019 20:42:53 +0100 Message-ID: <87y33sr41u.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 35386-done Cc: 35386-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello Chris, > > Christopher Baines skribis: > >> The go-build-system is slightly more appropriate, and switching resolves= an >> issue with combining the 'unpack phase from the gnu-build-system, and the >> 'setup-go-environment from the go-build-system. With both of those phases >> creating a directory, the first-subdirectory call at the end of the 'unp= ack >> phase can return different values depending on the filesystem ordering. >> >> * gnu/packages/shellutils.scm (direnv)[source]: Use the git repository, = as >> this works better with the go-build-system. >> [build-system]: Change to the go-build-system. >> [arguments]: Adjust for the go-build-system. >> [native-inputs]: Remove go. > > It does look a bit nicer this way, go for it! Great, I actually pushed this yesterday, and was slow with closing the bug. Thanks for taking a look :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlzHU75fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XeYDw//ajrn2Exlax5CLz/qMRT5Sb91poT8uYVJ6GCjHicF0XtYLkqadmCQpWIT lFJ0Opp/qbTeICjqrMO1lVlLU+9jWrcXaeKp1vDkAcxCejvhziGEWI/UpS6fk7eo pSa4RXqkXiuerFpPjwPsETEBAyDhzf3sNUdavLW5ovNDWbvWg/qAEJ2XxfbYgwRP NCDZ4Z2+YU0LBc9HevrVChrOhyvYmmqpk0jXws4HRd3KC/UXpQXqMF7EbkGvLLoI Khj4BozEyYqylHBJL79TVIuPOvqxaw2nQyNryV3gA1CJUrLeU4SqjGMPJTanDt75 qfF9hON12az/YbvzbpXaA49p8sDOwlSJxgyxM2lClZ3g9Qj++zhDItx7Q8TCdmVQ dLADmUMAvZ4p9SrgqzJMN2IleEqyTyzU7li8M6HLCj3XO5t7GJ+o1lC+l6LBw4vd M/2HjEaZe25/IE+U+GkcDLsPzUzOeLWGwxL5u5Zr3njFHcg/d2aUdme/2Yyb5i9w lMoAidKnLnTKnE4czAH9DZZgBfr7Jh70Klx638yBSWntZ94KgpQJxqLGnUZeZro0 BfUF51GpvWJ+JH6FA8iL+efKecS48xaSyRgLgR2UWzFn+Xweu6zdP/z4b3V52VJZ ZrgB99UDVzqhnp3Csy5m8tDmxjQ/LV0QvKw1nq8TRRkQ+fMJRcI= =+MKQ -----END PGP SIGNATURE----- --=-=-=-- ------------=_1556567042-23604-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Apr 2019 23:57:33 +0000 Received: from localhost ([127.0.0.1]:51926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIioX-0006DA-3R for submit@debbugs.gnu.org; Mon, 22 Apr 2019 19:57:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIioV-0006Cx-Q2 for submit@debbugs.gnu.org; Mon, 22 Apr 2019 19:57:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:42426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hIioQ-00013N-Ey for submit@debbugs.gnu.org; Mon, 22 Apr 2019 19:57:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIioO-0006tS-K7 for guix-patches@gnu.org; Mon, 22 Apr 2019 19:57:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIioN-0000zl-5Y for guix-patches@gnu.org; Mon, 22 Apr 2019 19:57:24 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIioM-0000yw-Tj for guix-patches@gnu.org; Mon, 22 Apr 2019 19:57:23 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 87D1B16EE9 for ; Tue, 23 Apr 2019 00:57:20 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 46eea4b2 for ; Mon, 22 Apr 2019 23:57:19 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: direnv: Change to the go-build-system. Date: Tue, 23 Apr 2019 00:57:19 +0100 Message-Id: <20190422235719.5427-1-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.71.252.8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) The go-build-system is slightly more appropriate, and switching resolves = an issue with combining the 'unpack phase from the gnu-build-system, and the 'setup-go-environment from the go-build-system. With both of those phases creating a directory, the first-subdirectory call at the end of the 'unpa= ck phase can return different values depending on the filesystem ordering. * gnu/packages/shellutils.scm (direnv)[source]: Use the git repository, a= s this works better with the go-build-system. [build-system]: Change to the go-build-system. [arguments]: Adjust for the go-build-system. [native-inputs]: Remove go. --- gnu/packages/shellutils.scm | 51 ++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 59a8b744eb..56359ce160 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -105,35 +105,40 @@ are already there.") (name "direnv") (version "2.15.2") (source - (origin (method url-fetch) - (uri (string-append "https://github.com/direnv/" name - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/direnv/direnv.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hhmc6rb7b1d4s4kgb4blrq35h388ax37ap88dq3dgfcw9w6j1rm")))= ) - (build-system gnu-build-system) + "1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w")))= ) + (build-system go-build-system) (arguments - `(#:test-target "test" - #:make-flags (list (string-append "DESTDIR=3D" (assoc-ref %output= s "out"))) - #:modules ((guix build gnu-build-system) - ((guix build go-build-system) #:prefix go:) - (guix build union) - (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build union) - (guix build go-build-system)) + '(#:import-path "github.com/direnv/direnv" #:phases (modify-phases %standard-phases - (delete 'configure) - ;; Help the build scripts find the Go language dependencies. - (add-before 'unpack 'setup-go-environment - (assoc-ref go:%standard-phases 'setup-go-environment)) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + (add-after 'unpack 'delete-vendor + (lambda _ + ;; Using a snippet causes issues with the name of the direc= tory, + ;; so delete the extra source code here. + (delete-file-recursively "src/github.com/direnv/direnv/vend= or") + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (with-directory-excursion "src/github.com/direnv/direnv" + ;; The following file needs to be writable so it can be + ;; modified by the testsuite. + (make-file-writable "test/scenarios/base/.envrc") + (invoke "make" "test") + ;; Clean up from the tests, especially so that the extr= a + ;; direnv executable that's generated is removed. + (invoke "make" "clean"))) + #t))))) (native-inputs - `(("go" ,go) - ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) + `(("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv= ) ("which" ,which))) (home-page "https://direnv.net/") --=20 2.21.0 ------------=_1556567042-23604-1--