summaryrefslogtreecommitdiff
path: root/gnu/packages/shellutils.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/shellutils.scm')
-rw-r--r--gnu/packages/shellutils.scm16
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 9a364d0adee..70236d9e5c2 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -292,7 +292,7 @@ are already there.")
292(define-public direnv 292(define-public direnv
293 (package 293 (package
294 (name "direnv") 294 (name "direnv")
295 (version "2.15.2") 295 (version "2.28.0")
296 (source 296 (source
297 (origin (method git-fetch) 297 (origin (method git-fetch)
298 (uri (git-reference 298 (uri (git-reference
@@ -301,18 +301,12 @@ are already there.")
301 (file-name (git-file-name name version)) 301 (file-name (git-file-name name version))
302 (sha256 302 (sha256
303 (base32 303 (base32
304 "1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w")))) 304 "0yk53jn7wafklixclka17wyjjs2g5giigjr2bd0xzy10nrzwp7c9"))))
305 (build-system go-build-system) 305 (build-system go-build-system)
306 (arguments 306 (arguments
307 '(#:import-path "github.com/direnv/direnv" 307 '(#:import-path "github.com/direnv/direnv"
308 #:phases 308 #:phases
309 (modify-phases %standard-phases 309 (modify-phases %standard-phases
310 (add-after 'unpack 'delete-vendor
311 (lambda _
312 ;; Using a snippet causes issues with the name of the directory,
313 ;; so delete the extra source code here.
314 (delete-file-recursively "src/github.com/direnv/direnv/vendor")
315 #t))
316 (add-after 'install 'install-manpages 310 (add-after 'install 'install-manpages
317 (lambda* (#:key outputs #:allow-other-keys) 311 (lambda* (#:key outputs #:allow-other-keys)
318 (let* ((out (assoc-ref outputs "out")) 312 (let* ((out (assoc-ref outputs "out"))
@@ -330,7 +324,9 @@ are already there.")
330 ;; The following file needs to be writable so it can be 324 ;; The following file needs to be writable so it can be
331 ;; modified by the testsuite. 325 ;; modified by the testsuite.
332 (make-file-writable "test/scenarios/base/.envrc") 326 (make-file-writable "test/scenarios/base/.envrc")
333 (invoke "make" "test") 327 ;; We need to manually run test because make test
328 ;; tries to use go modules
329 (invoke "go" "test" "./...")
334 ;; Clean up from the tests, especially so that the extra 330 ;; Clean up from the tests, especially so that the extra
335 ;; direnv executable that's generated is removed. 331 ;; direnv executable that's generated is removed.
336 (invoke "make" "clean"))) 332 (invoke "make" "clean")))
@@ -338,6 +334,8 @@ are already there.")
338 (native-inputs 334 (native-inputs
339 `(("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) 335 `(("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)
340 ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv) 336 ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)
337 ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty)
338 ("go-golang-org-x-mod" ,go-golang-org-x-mod)
341 ("which" ,which))) 339 ("which" ,which)))
342 (home-page "https://direnv.net/") 340 (home-page "https://direnv.net/")
343 (synopsis "Environment switcher for the shell") 341 (synopsis "Environment switcher for the shell")