Merge branch 'master' into ambient-nix-with-fallback

This commit is contained in:
mergify[bot] 2024-08-21 19:16:33 +00:00 committed by GitHub
commit 5bbcef53fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -287,7 +287,7 @@ use_flake() {
if [[ $flake_expr == -* ]]; then
local message="the first argument must be a flake expression"
if [[ -n $2 ]]; then
if [[ -n ${2:-} ]]; then
_nix_direnv_error "$message"
return 1
else
@ -442,15 +442,15 @@ use_nix() {
# ignore them
;;
--include | -I)
extra_args+=("$i" "$1")
extra_args+=("$i" "${1:-}")
shift
;;
--attr | -A)
attribute="$1"
attribute="${1:-}"
shift
;;
--option | -o | --arg | --argstr)
extra_args+=("$i" "$1" "$2")
extra_args+=("$i" "${1:-}" "${2:-}")
shift
shift
;;