nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 19:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't track $nixfile if it is empty

Browse source
This commit is contained in:
Bryan Bennett 2022-12-06 15:05:52 -05:00
parent 22b5729f26
commit 0db25e4de9
No known key found for this signature in database
GPG key ID: EF90E3E98B8F5C0B
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
direnvrc
View file

@ -336,9 +336,10 @@ use_nix() {
esac esac
done done
# nixfile may be empty, nix_direnv_watch_file "$HOME/.direnvrc" "$HOME/.config/direnv/direnvrc" ".envrc"
# but nix_direnv_watch_file checks for existence before adding to watches if [ -e "$nixfile" ]; then
nix_direnv_watch_file "$HOME/.direnvrc" "$HOME/.config/direnv/direnvrc" .envrc "$nixfile" nix_direnv_watch_file "$nixfile"
fi
local need_update=0 local need_update=0
local file= local file=

5
tests/test_use_nix.py
View file

@ -33,5 +33,10 @@ def test_args(direnv_project: DirenvProject) -> None:
direnv_exec(direnv_project, "echo $SHOULD_BE_SET") direnv_exec(direnv_project, "echo $SHOULD_BE_SET")
def test_no_files(direnv_project: DirenvProject) -> None:
direnv_project.setup_envrc("use nix -p hello")
direnv_exec(direnv_project, "hello")
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()