Remove nixFallback

This causes unintended schema upgrades, and is no longer needed now
that we have nixos/modules/installer/tools/nix-fallback-paths.nix.

Changed files
+14 -19
nixos
modules
installer
-3
nixos/default.nix
···
vm = vmConfig.system.build.vm;
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
-
-
# The following are used by nixos-rebuild.
-
nixFallback = pkgs.nixUnstable.out;
}
···
vm = vmConfig.system.build.vm;
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
}
+14 -16
nixos/modules/installer/tools/nixos-rebuild.sh
···
echo "building Nix..." >&2
nixDrv=
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then
-
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
-
if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
-
nixStorePath="$(prebuiltNix "$(uname -m)")"
-
if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
-
--option extra-binary-caches https://cache.nixos.org/; then
echo "warning: don't know how to get latest Nix" >&2
-
fi
-
# Older version of nix-store -r don't support --add-root.
-
[ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
-
if [ -n "$buildHost" ]; then
-
remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
-
remoteNix="$remoteNixStorePath/bin"
-
if ! buildHostCmd nix-store -r $remoteNixStorePath \
-
--option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
-
remoteNix=
-
echo "warning: don't know how to get latest Nix" >&2
-
fi
fi
fi
fi
···
echo "building Nix..." >&2
nixDrv=
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then
+
if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
+
nixStorePath="$(prebuiltNix "$(uname -m)")"
+
if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
+
--option extra-binary-caches https://cache.nixos.org/; then
+
echo "warning: don't know how to get latest Nix" >&2
+
fi
+
# Older version of nix-store -r don't support --add-root.
+
[ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
+
if [ -n "$buildHost" ]; then
+
remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
+
remoteNix="$remoteNixStorePath/bin"
+
if ! buildHostCmd nix-store -r $remoteNixStorePath \
+
--option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
+
remoteNix=
echo "warning: don't know how to get latest Nix" >&2
fi
fi
fi