mirror of
https://github.com/nix-community/home-manager
synced 2024-11-23 03:29:45 +01:00
direnv: work around nushell bug
try/catch in a pipeline does not always work correctly in 0.98, so avoid the try-catch entirely. Upstream issue: https://github.com/nushell/nushell/issues/13868
This commit is contained in:
parent
c124568e10
commit
57e6b30d18
2 changed files with 7 additions and 8 deletions
|
@ -141,12 +141,12 @@ in {
|
|||
| default []
|
||||
| append {||
|
||||
let direnv = (
|
||||
try {
|
||||
${getExe cfg.package} export json
|
||||
} catch {
|
||||
""
|
||||
}
|
||||
| from json
|
||||
# We want to get the stdout from direnv even if it exits with non-zero,
|
||||
# because it will have the DIRENV_ internal variables defined.
|
||||
do { ${getExe cfg.package} export json }
|
||||
| complete
|
||||
| get stdout
|
||||
| from json --strict
|
||||
| default {}
|
||||
)
|
||||
if ($direnv | is-empty) {
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
"home-files/.config/nushell/config.nu";
|
||||
in ''
|
||||
assertFileExists "${configFile}"
|
||||
assertFileRegex "${configFile}" \
|
||||
'^\s*/nix/store/.*direnv.*/bin/direnv export json$'
|
||||
assertFileRegex "${configFile}" '/nix/store/.*direnv.*/bin/direnv export json'
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue