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

nixos-rebuild: Remove --keep-going flag

Browse Source
This commit is contained in:
Eelco Dolstra 2020-02-07 19:49:01 +01:00
parent 4089dbf090
commit f9392f04ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,7 +418,7 @@ if [ -z "$rollback" ]; then
else else
outLink=$tmpDir/result outLink=$tmpDir/result
nix build "$flake#$flakeAttr.config.system.build.toplevel" \ nix build "$flake#$flakeAttr.config.system.build.toplevel" \
--keep-going "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink
pathToConfig="$(readlink -f $outLink)" pathToConfig="$(readlink -f $outLink)"
fi fi
copyToTarget "$pathToConfig" copyToTarget "$pathToConfig"
@ -427,7 +427,7 @@ if [ -z "$rollback" ]; then
if [[ -z $flake ]]; then if [[ -z $flake ]]; then
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")" pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")"
else else
nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" "${lockFlags[@]}" nix build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}"
pathToConfig="$(readlink -f ./result)" pathToConfig="$(readlink -f ./result)"
fi fi
elif [ "$action" = build-vm ]; then elif [ "$action" = build-vm ]; then