[bug#34271] Direnv 2.15.2 update

[bug#34271] Direnv 2.15.2 update

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

These patches update direnv to 2.15.2 and add its new dependency
'go-dotenv'.

This is the latest version of direnv that passes its test suite.

If we merge these patches, we can remove Go 1.9 which has been
unsupported for several months now.

Direnv users, please test :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34271] [PATCH 1/2] gnu: Add go-github-com-direnv-go-dotenv.

[Leo Famulari]

* gnu/packages/golang.scm (go-github-com-direnv-go-dotenv): New variable.
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e6269f526f..cedfabe5bf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3365,3 +3365,28 @@ have super fancy logs.")
       (synopsis "Filesystem-related functions for Go")
       (description "Package fs provides filesystem-related functions.")
       (license license:bsd-3))))
+
+(define-public go-github-com-direnv-go-dotenv
+  (let ((commit "4cce6d1a66f7bc8dc730eab85cab6af1b801abed")
+        (revision "0"))
+    (package
+      (name "go-github-com-direnv-go-dotenv")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/direnv/go-dotenv")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00wn4fc2lma0csf6ryvlc6k9jbpbifm4n7i3kkd2xrfw5qlm29b6"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/direnv/go-dotenv"))
+      (home-page "https://github.com/direnv/go-dotenv")
+      (synopsis "Go dotenv parsing library")
+      (description "This package provides a library for parsing the dotenv
+format in Go.")
+      (license license:expat))))
-- 
2.20.1

[bug#34271] [PATCH 2/2] gnu: direnv: Update to 2.15.2.

[Leo Famulari]

* gnu/packages/shellutils.scm (direnv): Update to 2.15.2.
[inputs]: Use the default Go compiler. Add go-github-com-burntsushi-toml
and go-github-com-direnv-go-dotenv.
[arguments]: Add a 'setup-go-environment' phase.
---
 gnu/packages/shellutils.scm | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 0978300c9b..a672aa041a 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
   #:use-module (guix build-system python))
 
 (define-public envstore
@@ -102,7 +103,7 @@ are already there.")
 (define-public direnv
   (package
     (name "direnv")
-    (version "2.11.3")
+    (version "2.15.2")
     (source
      (origin (method url-fetch)
              (uri (string-append "https://github.com/direnv/" name
@@ -110,14 +111,26 @@ are already there.")
              (file-name (string-append name "-" version ".tar.gz"))
              (sha256
               (base32
-               "01mhwzq9ss2qlnn8aahvwsgnspq8hbz0qfknf290aicngwx10d1d"))))
+               "1hhmc6rb7b1d4s4kgb4blrq35h388ax37ap88dq3dgfcw9w6j1rm"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:test-target "test"
+     `(#:test-target "test"
        #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
-       #:phases (modify-phases %standard-phases (delete 'configure))))
+       #:modules ((guix build gnu-build-system)
+                  ((guix build go-build-system) #:prefix go:)
+                  (guix build utils))
+       #:imported-modules (,@%gnu-build-system-modules
+                            (guix build go-build-system))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         ;; Help the build scripts find the Go language dependencies.
+         (add-after 'unpack 'setup-go-environment
+           (assoc-ref go:%standard-phases 'setup-environment)))))
     (inputs
-     `(("go" ,go-1.9)))
+     `(("go" ,go)
+       ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)
+       ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)))
     (native-inputs
       `(("which" ,which)))
     (home-page "https://direnv.net/")
-- 
2.20.1

[bug#34271] [PATCH 2/2] gnu: direnv: Update to 2.15.2.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2682 bytes --]


Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/shellutils.scm (direnv): Update to 2.15.2.
> [inputs]: Use the default Go compiler. Add go-github-com-burntsushi-toml
> and go-github-com-direnv-go-dotenv.
> [arguments]: Add a 'setup-go-environment' phase.
> ---
>  gnu/packages/shellutils.scm | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
> index 0978300c9b..a672aa041a 100644
> --- a/gnu/packages/shellutils.scm
> +++ b/gnu/packages/shellutils.scm
> @@ -35,6 +35,7 @@
>    #:use-module (gnu packages pkg-config)
>    #:use-module (guix utils)
>    #:use-module (guix build-system gnu)
> +  #:use-module (guix build-system go)
>    #:use-module (guix build-system python))
>  
>  (define-public envstore
> @@ -102,7 +103,7 @@ are already there.")
>  (define-public direnv
>    (package
>      (name "direnv")
> -    (version "2.11.3")
> +    (version "2.15.2")
>      (source
>       (origin (method url-fetch)
>               (uri (string-append "https://github.com/direnv/" name
> @@ -110,14 +111,26 @@ are already there.")
>               (file-name (string-append name "-" version ".tar.gz"))
>               (sha256
>                (base32
> -               "01mhwzq9ss2qlnn8aahvwsgnspq8hbz0qfknf290aicngwx10d1d"))))
> +               "1hhmc6rb7b1d4s4kgb4blrq35h388ax37ap88dq3dgfcw9w6j1rm"))))
>      (build-system gnu-build-system)
>      (arguments
> -     '(#:test-target "test"
> +     `(#:test-target "test"
>         #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
> -       #:phases (modify-phases %standard-phases (delete 'configure))))
> +       #:modules ((guix build gnu-build-system)
> +                  ((guix build go-build-system) #:prefix go:)
> +                  (guix build utils))
> +       #:imported-modules (,@%gnu-build-system-modules
> +                            (guix build go-build-system))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure)
> +         ;; Help the build scripts find the Go language dependencies.
> +         (add-after 'unpack 'setup-go-environment
> +           (assoc-ref go:%standard-phases 'setup-environment)))))
>      (inputs
> -     `(("go" ,go-1.9)))
> +     `(("go" ,go)
> +       ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)
> +       ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)))
>      (native-inputs
>        `(("which" ,which)))
>      (home-page "https://direnv.net/")

Looks good to me, thanks for updating it :D

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#34271] [PATCH 1/2] gnu: Add go-github-com-direnv-go-dotenv.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]


Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/golang.scm (go-github-com-direnv-go-dotenv): New variable.
> ---
>  gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index e6269f526f..cedfabe5bf 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -3365,3 +3365,28 @@ have super fancy logs.")
>        (synopsis "Filesystem-related functions for Go")
>        (description "Package fs provides filesystem-related functions.")
>        (license license:bsd-3))))
> +
> +(define-public go-github-com-direnv-go-dotenv
> +  (let ((commit "4cce6d1a66f7bc8dc730eab85cab6af1b801abed")
> +        (revision "0"))
> +    (package
> +      (name "go-github-com-direnv-go-dotenv")
> +      (version (git-version "0.0.0" revision commit))
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/direnv/go-dotenv")
> +               (commit commit)))
> +         (file-name (git-file-name name version))
> +         (sha256
> +          (base32
> +           "00wn4fc2lma0csf6ryvlc6k9jbpbifm4n7i3kkd2xrfw5qlm29b6"))))
> +      (build-system go-build-system)
> +      (arguments
> +       '(#:import-path "github.com/direnv/go-dotenv"))
> +      (home-page "https://github.com/direnv/go-dotenv")
> +      (synopsis "Go dotenv parsing library")
> +      (description "This package provides a library for parsing the dotenv
> +format in Go.")
> +      (license license:expat))))

Looks good to me :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]