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

nixos-rebuild: Remove TODOs

This commit is contained in:
Eelco Dolstra 2020-02-10 15:31:23 +01:00
parent c05cc615f2
commit 8f86624ac9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,7 @@ fi
# If ‘--upgrade’ is given, run ‘nix-channel --update nixos’. # If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
if [ -n "$upgrade" -a -z "$_NIXOS_REBUILD_REEXEC" ]; then if [[ -n $upgrade && -z $_NIXOS_REBUILD_REEXEC && -z $flake ]]; then
nix-channel --update nixos nix-channel --update nixos
# If there are other channels that contain a file called # If there are other channels that contain a file called
@ -350,7 +350,6 @@ prebuiltNix() {
remotePATH= remotePATH=
# FIXME: get nix from the flake.
if [[ -n $buildNix && -z $flake ]]; then if [[ -n $buildNix && -z $flake ]]; then
echo "building Nix..." >&2 echo "building Nix..." >&2
nixDrv= nixDrv=
@ -434,14 +433,14 @@ if [ -z "$rollback" ]; then
if [[ -z $flake ]]; then if [[ -z $flake ]]; then
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")" pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")"
else else
echo "TODO: not implemented" >&2 echo "$0: 'build-vm' is not supported with '--flake'" >&2
exit 1 exit 1
fi fi
elif [ "$action" = build-vm-with-bootloader ]; then elif [ "$action" = build-vm-with-bootloader ]; then
if [[ -z $flake ]]; then if [[ -z $flake ]]; then
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")"
else else
echo "TODO: not implemented" >&2 echo "$0: 'build-vm-with-bootloader' is not supported with '--flake'" >&2
exit 1 exit 1
fi fi
else else