mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2024-12-14 11:57:55 +00:00
Code Activity

direnv: update for new nushell behavior (#5880)

Browse source 
Nushell 0.98 makes it so external commands returning non-zero
is considered an exception[0]. Wrap the direnv invocation in a
try-catch, so that even if direnv fails, we get the message
from direnv, but not the traceback from nushell.

[0]: https://www.nushell.sh/blog/2024-09-17-nushell_0_98_0.html#non-zero-exit-codes-are-now-errors-toc
This commit is contained in:
K900 2024-09-25 09:39:06 +03:00 committed by GitHub
parent 21c021862f
commit 1e22ef1518
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/programs/direnv.nix
View file

@ -140,9 +140,15 @@ in {
$env.config.hooks.pre_prompt? $env.config.hooks.pre_prompt?
| default [] | default []
| append {|| | append {||
let direnv = (${getExe cfg.package} export json let direnv = (
| from json try {
| default {}) ${getExe cfg.package} export json
} catch {
""
}
| from json
| default {}
)
if ($direnv | is-empty) { if ($direnv | is-empty) {
return return
} }

2
tests/modules/programs/direnv/nushell.nix
View file

@ -14,6 +14,6 @@
in '' in ''
assertFileExists "${configFile}" assertFileExists "${configFile}"
assertFileRegex "${configFile}" \ assertFileRegex "${configFile}" \
'^\s*let direnv = (/nix/store/.*direnv.*/bin/direnv export json$' '^\s*/nix/store/.*direnv.*/bin/direnv export json$'
''; '';
} }