Merge pull request #153515 from thiagokokada/workaround-issue-144811
nixos-rebuild: do not resolve flake path
This commit is contained in:
commit
06235ce774
pkgs/os-specific/linux/nixos-rebuild
@ -3,7 +3,6 @@
|
|||||||
, coreutils
|
, coreutils
|
||||||
, gnused
|
, gnused
|
||||||
, gnugrep
|
, gnugrep
|
||||||
, jq
|
|
||||||
, nix
|
, nix
|
||||||
, lib
|
, lib
|
||||||
}:
|
}:
|
||||||
@ -19,5 +18,5 @@ substituteAll {
|
|||||||
nix_x86_64_linux = fallback.x86_64-linux;
|
nix_x86_64_linux = fallback.x86_64-linux;
|
||||||
nix_i686_linux = fallback.i686-linux;
|
nix_i686_linux = fallback.i686-linux;
|
||||||
nix_aarch64_linux = fallback.aarch64-linux;
|
nix_aarch64_linux = fallback.aarch64-linux;
|
||||||
path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
|
path = lib.makeBinPath [ coreutils gnused gnugrep ];
|
||||||
}
|
}
|
||||||
|
@ -343,11 +343,6 @@ if [[ -n $flake ]]; then
|
|||||||
fi
|
fi
|
||||||
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.
|
# Find configuration.nix and open editor instead of building.
|
||||||
if [ "$action" = edit ]; then
|
if [ "$action" = edit ]; then
|
||||||
if [[ -z $flake ]]; then
|
if [[ -z $flake ]]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user