Merge pull request #153515 from thiagokokada/workaround-issue-144811

nixos-rebuild: do not resolve flake path

Changed files
+1 -7
pkgs
os-specific
linux
+1 -2
pkgs/os-specific/linux/nixos-rebuild/default.nix
···
, coreutils
, gnused
, gnugrep
-
, jq
, nix
, lib
}:
···
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
nix_aarch64_linux = fallback.aarch64-linux;
-
path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
+
path = lib.makeBinPath [ coreutils gnused gnugrep ];
}
-5
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
···
fi
fi
-
# Resolve the flake.
-
if [[ -n $flake ]]; then
-
flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
-
fi
-
# Find configuration.nix and open editor instead of building.
if [ "$action" = edit ]; then
if [[ -z $flake ]]; then