Skip to content

nixos-rebuild: do not resolve flake path #153515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thiagokokada merged 2 commits into from
Jan 8, 2022
Merged

nixos-rebuild: do not resolve flake path #153515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c274d04
nixos-rebuild: do not resolve flake path
thiagokokada Jan 4, 2022
c75bc3a
nixos-rebuild: remove jq
thiagokokada Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkgs/os-specific/linux/nixos-rebuild/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, coreutils
, gnused
, gnugrep
, jq
, nix
, lib
}:
Expand All @@ -19,5 +18,5 @@ substituteAll {
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 changes: 0 additions & 5 deletions pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,6 @@ if [[ -n $flake ]]; then
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
Expand Down