GNU bug report logs - #51022
[PATCH] Update direnv to 2.28.0

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51022 in the body.
You can then email your comments to 51022 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Artem Chernyak <artemchernyak <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] Update direnv to 2.28.0
Date: Mon, 4 Oct 2021 21:23:25 -0500

[Message part 1 (text/plain, inline)]

This patch includes an update to direnv. As part of the updated a few
extra changes were necessary to support the new version:

- Addition of go-golang-org-x-mod as a new dependency.
- Removal of the delete-vendor step since direnv no longer depends on
vendor files.
- Removal of the test run. The new tests depend on
https://github.com/golangci/golangci-lint which requires a lot of othe
dependencies. Since it's only needed for tests, maybe we can handle it
in a separate patch or once golangci-lint becomes needed in other
places.

[0001-Update-direnv-to-2.28.0.patch (text/x-patch, attachment)]

Message #8 received at 51022 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Artem Chernyak <artemchernyak <at> gmail.com>
Cc: 51022 <at> debbugs.gnu.org
Subject: Re: bug#51022: [PATCH] Update direnv to 2.28.0
Date: Wed, 13 Oct 2021 11:47:33 +0200

Hi Artem,

Artem Chernyak <artemchernyak <at> gmail.com> skribis:

> This patch includes an update to direnv. As part of the updated a few
> From ced4b50ad1dda92e7ba58bebbe702b9dd7a3dae9 Mon Sep 17 00:00:00 2001
> From: hackeryarn <artemchernyak <at> gmail.com>
> Date: Mon, 4 Oct 2021 21:08:46 -0500
> Subject: [PATCH] Update direnv to 2.28.0
>
> ---
>  gnu/packages/golang.scm     | 37 +++++++++++++++++++++++++++++++++++++
>  gnu/packages/shellutils.scm | 13 +++++--------
>  2 files changed, 42 insertions(+), 8 deletions(-)
>
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index a96f743f68..3e4e691631 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -2669,6 +2669,43 @@ time.")
>        (home-page "https://godoc.org/golang.org/x/xerrors")
>        (license license:bsd-3))))
>  
> +(define-public go-golang-org-x-mod
> +  (let ((commit "0f08993efd8a8ec67e75bcccf86b0e1569b0ab0a")
> +        (revision "0"))

I’ve added this as a separate commit and tweaked the description and the
commit log according to our conventions:

  https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html

I noticed that source code has disappeared upstream and is instead being
fetched from Software Heritage:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix build go-golang-org-x-mod -S --check
The following derivation will be built:
   /gnu/store/9rb03xwbdkkvi1zjivilpl011pxw5hwv-go-golang-org-x-mod-0.5.0-0.0f08993-checkout.drv
building /gnu/store/9rb03xwbdkkvi1zjivilpl011pxw5hwv-go-golang-org-x-mod-0.5.0-0.0f08993-checkout.drv...
guile: warning: failed to install locale
environment variable `PATH' set to `/gnu/store/378zjf2kgajcfd7mfr98jn5xyc5wa3qv-gzip-1.10/bin:/gnu/store/sf3rbvb6iqcphgm1afbplcs72hsywg25-tar-1.32/bin'
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint: 
hint: 	git config --global init.defaultBranch <name>
hint: 
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint: 
hint: 	git branch -m <name>
Initialized empty Git repository in /gnu/store/yyy7l1i2g769fsbwb97a9m8i4as549nd-go-golang-org-x-mod-0.5.0-0.0f08993-checkout/.git/
fatal: remote error: Git repository not found
Failed to do a shallow fetch; retrying a full fetch...
fatal: remote error: Git repository not found
git-fetch: '/gnu/store/5vai7bfrfkzv22dx13bxpszjrqyi78x6-git-minimal-2.33.0/bin/git fetch origin' failed with exit code 128
Trying content-addressed mirror at berlin.guix.gnu.org...
Trying content-addressed mirror at berlin.guix.gnu.org...
Trying to download from Software Heritage...
SWH: found revision 0f08993efd8a8ec67e75bcccf86b0e1569b0ab0a with directory at 'https://archive.softwareheritage.org/api/1/directory/0a72c9a9750b330483f510b8224732ecadc1547f/'
swh:1:dir:0a72c9a9750b330483f510b8224732ecadc1547f/
swh:1:dir:0a72c9a9750b330483f510b8224732ecadc1547f/LICENSE
[…]
--8<---------------cut here---------------end--------------->8---

Is there another URL we should use?  (No big deal since it’s archived on
Software Heritage anyway.)

> +++ b/gnu/packages/shellutils.scm
> @@ -239,7 +239,7 @@ are already there.")
>  (define-public direnv
>    (package
>      (name "direnv")
> -    (version "2.15.2")
> +    (version "2.28.0")
>      (source
>       (origin (method git-fetch)
>               (uri (git-reference
> @@ -248,18 +248,13 @@ are already there.")
>               (file-name (git-file-name name version))
>               (sha256
>                (base32
> -               "1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w"))))
> +               "0yk53jn7wafklixclka17wyjjs2g5giigjr2bd0xzy10nrzwp7c9"))))
>      (build-system go-build-system)
>      (arguments
>       '(#:import-path "github.com/direnv/direnv"
> +       #:tests? #f ;; TODO fix tests

Not confidence-inspiring.  :-)  Could you take a closer look to get an
understanding of why tests are failing?

Based on that we’ll either fix whatever problem leads to failures, or
selectively disable the offending test(s), and only as a last resort
disable tests altogether, with a comment explaining what the problem is.

TIA!

Ludo’.

Message #11 received at 51022 <at> debbugs.gnu.org (full text, mbox):

From: Artem Chernyak <artemchernyak <at> gmail.com>
To: 51022 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Update direnv to 2.28.0
Date: Thu, 14 Oct 2021 18:39:21 -0500

[Message part 1 (text/plain, inline)]

Hi Ludovic,

Thanks for the feedback. I was able to figure out that the make test
process, used previously, tried to install Go modules. That seemed to
cause the error with the tests. The test ran fine when executed
directly with Go.

Also, thank you for the feedback on my patch formatting. Hope I got it
right this time. I would appreciate any additional feedback you may
have since it's my first contribution to guix and first time
contributing using patches (not using github or gitlab.)

-- 
Sincerely,
Artem Chernyak

[0001-gnu-Update-direnv-to-2.28.0.patch (text/x-patch, attachment)]

Message #16 received at 51022-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Artem Chernyak <artemchernyak <at> gmail.com>
Cc: 51022-done <at> debbugs.gnu.org
Subject: Re: bug#51022: [PATCH] Update direnv to 2.28.0
Date: Mon, 18 Oct 2021 10:36:08 +0200

Hi Artem,

Artem Chernyak <artemchernyak <at> gmail.com> skribis:

> From 5a3079f17a056c59c5fbc3cb5e4490170c8adabf Mon Sep 17 00:00:00 2001
> From: Artem Chernyak <artemchernyak <at> gmail.com>
> Date: Mon, 4 Oct 2021 21:08:46 -0500
> Subject: [PATCH] gnu: Update direnv to 2.28.0
>
> * gnu/packages/shellutils.scm (direnv): Update to 2.28.0

Awesome.  Pushed with some tweaks to the commit log:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=f5a7a42da82055c316aadf2d736857de2b0ab34a

I also found a mirror of ‘go-golang-org-x-mod’:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=846a21525293bc107b57812682e7a14ffe3e4082

Thanks,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.