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

nixos-rebuild: Don't build nixos-rebuild with --fast

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-02-11 15:52:23 +02:00
parent 23fee8bfbd
commit 2000f0941e
1 changed files with 3 additions and 1 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

@ -15,6 +15,7 @@ origArgs=("$@")
extraBuildFlags=() extraBuildFlags=()
action= action=
buildNix=1 buildNix=1
fast=
rollback= rollback=
upgrade= upgrade=
repair= repair=
@ -66,6 +67,7 @@ while [ "$#" -gt 0 ]; do
;; ;;
--fast) --fast)
buildNix= buildNix=
fast=1
extraBuildFlags+=(--show-trace) extraBuildFlags+=(--show-trace)
;; ;;
--profile-name|-p) --profile-name|-p)
@ -217,7 +219,7 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then
fi fi
# Re-execute nixos-rebuild from the Nixpkgs tree. # Re-execute nixos-rebuild from the Nixpkgs tree.
if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" ]; then if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then
if p=$(nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then if p=$(nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then
export _NIXOS_REBUILD_REEXEC=1 export _NIXOS_REBUILD_REEXEC=1
exec $p/bin/nixos-rebuild "${origArgs[@]}" exec $p/bin/nixos-rebuild "${origArgs[@]}"