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

drop nix version checks

Browse source 
Fixes https://github.com/nix-community/nix-direnv/issues/582
Checks broke and we can simplify them by deleting.
People that still have nix older than 2.4 in their PATH have to now set
NIX_DIRENV_FALLBACK_NIX themselves.
This commit is contained in:
Jörg Thalheim 2025-05-27 09:12:04 +02:00
parent ce19520ab7
commit 5a9e078e9e
1 changed files with 6 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
direnvrc
View file

@ -6,7 +6,6 @@ NIX_DIRENV_VERSION=3.0.7
# min required versions # min required versions
BASH_MIN_VERSION=4.4 BASH_MIN_VERSION=4.4
DIRENV_MIN_VERSION=2.21.3 DIRENV_MIN_VERSION=2.21.3
NIX_MIN_VERSION=2.4
_NIX_DIRENV_LOG_PREFIX="nix-direnv: " _NIX_DIRENV_LOG_PREFIX="nix-direnv: "
@ -57,34 +56,6 @@ _require_cmd_version() {
_require_version "$cmd" "${BASH_REMATCH[1]}" "$required" _require_version "$cmd" "${BASH_REMATCH[1]}" "$required"
} }
_nix_direnv_resolve_nix() {
local ambient_nix
if ambient_nix=$(command -v nix); then
if _require_cmd_version "${ambient_nix}" "${NIX_MIN_VERSION}"; then
echo "${ambient_nix}"
return 0
else
_nix_direnv_warning "Nix version in PATH is too old, wanted ${NIX_MIN_VERSION}+, got $(${ambient_nix} --version), will attempt fallback"
fi
else
_nix_direnv_warning "Could not find Nix in PATH, will attempt fallback"
fi
if [ -n "${NIX_DIRENV_FALLBACK_NIX}" ]; then
if _require_cmd_version "${NIX_DIRENV_FALLBACK_NIX}" "${NIX_MIN_VERSION}"; then
echo "${NIX_DIRENV_FALLBACK_NIX}"
return 0
else
_nix_direnv_error "Fallback Nix version is too old, wanted ${NIX_MIN_VERSION}+, got $(${NIX_DIRENV_FALLBACK_NIX} --version)"
return 1
fi
else
_nix_direnv_error "Could not find fallback Nix binary, please add Nix to PATH or set NIX_DIRENV_FALLBACK_NIX"
return 1
fi
}
_nix_direnv_preflight() { _nix_direnv_preflight() {
if [[ -z $direnv ]]; then if [[ -z $direnv ]]; then
# shellcheck disable=2016 # shellcheck disable=2016
@ -104,7 +75,12 @@ _nix_direnv_preflight() {
fi fi
fi fi
if ! _nix_direnv_nix=$(_nix_direnv_resolve_nix); then if command -v nix >/dev/null 2>&1; then
_nix_direnv_nix=$(command -v nix)
elif [[ -n ${NIX_DIRENV_FALLBACK_NIX:-} ]]; then
_nix_direnv_nix="${NIX_DIRENV_FALLBACK_NIX}"
else
_nix_direnv_error "Could not find Nix binary, please add Nix to PATH or set NIX_DIRENV_FALLBACK_NIX"
return 1 return 1
fi fi