dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions2 Packages Projects Releases Wiki Activity

Merge pull request from thiagokokada/workaround-issue-144811

Browse Source 
nixos-rebuild: do not resolve flake path
This commit is contained in:
Thiago Kenji Okada 2022-01-07 23:18:37 -03:00 committed by GitHub
commit 06235ce774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
pkgs/os-specific/linux/nixos-rebuild
default.nixnixos-rebuild.sh

3
pkgs/os-specific/linux/nixos-rebuild/default.nix
View File

@ -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 ];
} }

5
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@ -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