me/guix
Archived
1
0
Fork 0
Code Activity

gnu: direnv: Update to 2.28.0.

Browse source 
* gnu/packages/shellutils.scm (direnv): Update to 2.28.0.
[arguments]: Remove 'delete-vendor' phase, which is no longer needed.
In 'check' phase, run "go test".
[native-inputs]: Add GO-GITHUB-COM-MATTN-GO-ISATTY and GO-GOLANG-ORG-X-MOD.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Artem Chernyak 2021-10-04 21:08:46 -05:00 • committed by Ludovic Courtès
parent 0d2400ceca
commit f5a7a42da8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/shellutils.scm
View file

@ -292,7 +292,7 @@ are already there.")
(define-public direnv (define-public direnv
(package (package
(name "direnv") (name "direnv")
(version "2.15.2") (version "2.28.0")
(source (source
(origin (method git-fetch) (origin (method git-fetch)
(uri (git-reference (uri (git-reference
@ -301,18 +301,12 @@ are already there.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w")))) "0yk53jn7wafklixclka17wyjjs2g5giigjr2bd0xzy10nrzwp7c9"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/direnv/direnv" '(#:import-path "github.com/direnv/direnv"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'delete-vendor
(lambda _
;; Using a snippet causes issues with the name of the directory,
;; so delete the extra source code here.
(delete-file-recursively "src/github.com/direnv/direnv/vendor")
#t))
(add-after 'install 'install-manpages (add-after 'install 'install-manpages
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -330,7 +324,9 @@ are already there.")
;; The following file needs to be writable so it can be ;; The following file needs to be writable so it can be
;; modified by the testsuite. ;; modified by the testsuite.
(make-file-writable "test/scenarios/base/.envrc") (make-file-writable "test/scenarios/base/.envrc")
(invoke "make" "test") ;; 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 ;; Clean up from the tests, especially so that the extra
;; direnv executable that's generated is removed. ;; direnv executable that's generated is removed.
(invoke "make" "clean"))) (invoke "make" "clean")))
@ -338,6 +334,8 @@ are already there.")
(native-inputs (native-inputs
`(("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) ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)
("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty)
("go-golang-org-x-mod" ,go-golang-org-x-mod)
("which" ,which))) ("which" ,which)))
(home-page "https://direnv.net/") (home-page "https://direnv.net/")
(synopsis "Environment switcher for the shell") (synopsis "Environment switcher for the shell")