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

nixos-rebuild: Move the Nix fallback store paths into a separate file

This commit is contained in:
Eelco Dolstra 2016-09-06 16:07:24 +02:00
parent 5cbfbb1553
commit 1fef99942e
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/installer/tools/nix-fallback-paths.nix Normal file
View File

@ -0,0 +1,5 @@
{
x86_64-linux = "/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10";
i686-linux = "/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10";
}

4
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -261,9 +261,9 @@ fi
prebuiltNix() { prebuiltNix() {
machine="$1" machine="$1"
if [ "$machine" = x86_64 ]; then if [ "$machine" = x86_64 ]; then
echo /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 echo @nix_x86_64_linux@
elif [[ "$machine" =~ i.86 ]]; then elif [[ "$machine" =~ i.86 ]]; then
echo /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 echo @nix_i686_linux@
else else
echo "$0: unsupported platform" echo "$0: unsupported platform"
exit 1 exit 1

6
nixos/modules/installer/tools/tools.nix
View File

@ -32,10 +32,14 @@ let
"cp refs $out"; "cp refs $out";
}; };
nixos-rebuild = makeProg { nixos-rebuild =
let fallback = import ./nix-fallback-paths.nix; in
makeProg {
name = "nixos-rebuild"; name = "nixos-rebuild";
src = ./nixos-rebuild.sh; src = ./nixos-rebuild.sh;
nix = config.nix.package.out; nix = config.nix.package.out;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
}; };
nixos-generate-config = makeProg { nixos-generate-config = makeProg {