Merge branch 'master' into update_flake_lock_action

nix-community · Dec 18, 2023 · 5db2aaf · 5db2aaf
2 parents 5cb149f + d18f048
commit 5db2aaf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/direnvrc b/direnvrc
@@ -63,7 +63,8 @@ _nix_direnv_preflight() {
   # instead of _require_cmd_version because _require_cmd_version uses =~ operator which
   # would be a syntax error on bash < 3
   _require_version bash "$BASH_VERSION" "$BASH_MIN_VERSION"
-  _require_cmd_version direnv "$DIRENV_MIN_VERSION"
+  # direnv stdlib defines $direnv
+  _require_cmd_version "$direnv" "$DIRENV_MIN_VERSION"
   _require_cmd_version nix "$NIX_MIN_VERSION"
 
   local layout_dir