GNU bug report logs - #78335
[PATCH] gnu: direnv: Update to 2.36.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 78335 in the body.
You can then email your comments to 78335 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: Zheng Junjie <z572 <at> z572.online>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: direnv: Update to 2.36.0.
Date: Sat, 10 May 2025 00:03:33 +0800

* gnu/packages/shellutils.scm (direnv): Update to 2.36.0.
[arguments]: Use G-expressions.

Change-Id: Icc3a96a8a5d44fa48b2ef3af68714776dd497102
---
 gnu/packages/shellutils.scm | 55 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index ea6dcafbc94..6c1bd0dc17d 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -742,7 +742,7 @@ (define-public tran
 (define-public direnv
   (package
     (name "direnv")
-    (version "2.35.0")
+    (version "2.36.0")
     (source
      (origin (method git-fetch)
              (uri (git-reference
@@ -751,35 +751,34 @@ (define-public direnv
              (file-name (git-file-name name version))
              (sha256
               (base32
-               "0l9pziv5nxlq6dxbsqrfl6z4ibq171wfx6wmjs392cdn5w2n908b"))))
+               "0p6n9zi3p9frj3ndnpdc1cz51hq0nkyjc9b1rqg7967l8vhdr8f6"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/direnv/direnv"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-manpages
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man (string-append out "/share/man/man1")))
-               (mkdir-p man)
-               (with-directory-excursion "src/github.com/direnv/direnv"
-                 (install-file "man/direnv.1" man)
-                 (install-file "man/direnv-stdlib.1" man)
-                 (install-file "man/direnv.toml.1" man)))))
-         (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")
-                 ;; We need to manually run test because make test
-                 ;; tries to use go modules
-                 (invoke "go" "test" "./...")
-                 ;; Clean up from the tests, especially so that the extra
-                 ;; direnv executable that's generated is removed.
-                 (invoke "make" "clean"))))))))
+     (list #:import-path "github.com/direnv/direnv"
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-manpages
+                 (lambda _
+                   (let* ((man (string-append #$output "/share/man/man1")))
+                     (mkdir-p man)
+                     (with-directory-excursion "src/github.com/direnv/direnv"
+                       (install-file "man/direnv.1" man)
+                       (install-file "man/direnv-stdlib.1" man)
+                       (install-file "man/direnv.toml.1" man)))))
+               (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")
+                       ;; We need to manually run test because make test
+                       ;; tries to use go modules
+                       (invoke "go" "test" "./...")
+                       ;; Clean up from the tests, especially so that the extra
+                       ;; direnv executable that's generated is removed.
+                       (invoke "make" "clean"))))))))
     (native-inputs
      (list go-github-com-burntsushi-toml
            go-github-com-mattn-go-isatty

base-commit: f348d2be2e019fcda44af8ab81073e2f04697a38
-- 
2.49.0

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

From: Christopher Baines <mail <at> cbaines.net>
To: Zheng Junjie <z572 <at> z572.online>
Cc: 78335-done <at> debbugs.gnu.org
Subject: Re: [bug#78335] [PATCH] gnu: direnv: Update to 2.36.0.
Date: Sun, 11 May 2025 10:32:09 +0100

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

Zheng Junjie <z572 <at> z572.online> writes:

> * gnu/packages/shellutils.scm (direnv): Update to 2.36.0.
> [arguments]: Use G-expressions.
>
> Change-Id: Icc3a96a8a5d44fa48b2ef3af68714776dd497102
> ---
>  gnu/packages/shellutils.scm | 55 ++++++++++++++++++-------------------
>  1 file changed, 27 insertions(+), 28 deletions(-)

Looks good to me, I've pushed this to master as
9f227e39151684503a3bd2e2cc6820aca04169b8.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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