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

Issue a warning if we fallback to the old shell

Browse source
This commit is contained in:
Bryan Bennett 2024-04-19 15:54:37 -04:00
parent 57f831e2e4
commit e9d3a36775
No known key found for this signature in database
GPG key ID: EE149E4215408DE9
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
direnvrc
View file

@ -298,6 +298,7 @@ use_flake() {
local tmp_profile_rc local tmp_profile_rc
local tmp_profile="${layout_dir}/flake-tmp-profile.$$" local tmp_profile="${layout_dir}/flake-tmp-profile.$$"
if tmp_profile_rc=$(_nix print-dev-env --profile "$tmp_profile" "$@"); then if tmp_profile_rc=$(_nix print-dev-env --profile "$tmp_profile" "$@"); then
# If we've gotten here, the user's current devShell is valid and we should cache it
_nix_clean_old_gcroots "$layout_dir" _nix_clean_old_gcroots "$layout_dir"
# We need to update our cache # We need to update our cache
@ -318,13 +319,19 @@ use_flake() {
flake_input_paths="${flake_input_paths/${store_path}/}" flake_input_paths="${flake_input_paths/${store_path}/}"
done done
_nix_direnv_info "renewed cache" _nix_direnv_info "Renewed cache"
else
# The user's current flake failed to evaluate,
# but there is already a prior profile_rc,
# which is probably more useful than nothing.
# Fallback to use that (which means just leaving profile_rc alone!)
_nix_direnv_warning "Evaluating current devShell failed. Falling back to previous environment!"
fi fi
fi fi
else else
if [[ -e ${profile_rc} ]]; then if [[ -e ${profile_rc} ]]; then
# Our cache is valid, use that # Our cache is valid, use that
_nix_direnv_info "using cached dev shell" _nix_direnv_info "Using cached dev shell"
else else
# We don't have a profile_rc to use! # We don't have a profile_rc to use!
_nix_direnv_error "use_flake failed - Is your flake's devShell working?" _nix_direnv_error "use_flake failed - Is your flake's devShell working?"
@ -469,7 +476,9 @@ use_nix() {
echo "$tmp_profile_rc" >"$profile_rc" echo "$tmp_profile_rc" >"$profile_rc"
_nix_add_gcroot "$tmp_profile" "$profile" _nix_add_gcroot "$tmp_profile" "$profile"
rm -f "$tmp_profile" "$tmp_profile"* rm -f "$tmp_profile" "$tmp_profile"*
_nix_direnv_info "renewed cache" _nix_direnv_info "Renewed cache"
else
_nix_direnv_warning "Evaluating current nix shell failed. Falling back to previous environment!"
fi fi
fi fi
else else