* Added an action `nixos-rebuild pull' to just pull the Nixpkgs
channel manifest and exit. Useful if you don't want to use nix-channel. svn path=/nixos/trunk/; revision=22601
This commit is contained in:
parent
f0b647c326
commit
f1dde44ac1
|
@ -23,6 +23,7 @@ The operation is one of the following:
|
||||||
build-vm: build a virtual machine containing the configuration
|
build-vm: build a virtual machine containing the configuration
|
||||||
(useful for testing)
|
(useful for testing)
|
||||||
dry-run: just show what store paths would be built/downloaded
|
dry-run: just show what store paths would be built/downloaded
|
||||||
|
pull: just pull the Nixpkgs channel manifest and exit
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
|
|
||||||
|
@ -63,7 +64,7 @@ while test "$#" -gt 0; do
|
||||||
--help)
|
--help)
|
||||||
showSyntax
|
showSyntax
|
||||||
;;
|
;;
|
||||||
switch|boot|test|build|dry-run|build-vm)
|
switch|boot|test|build|dry-run|build-vm|pull)
|
||||||
action="$i"
|
action="$i"
|
||||||
;;
|
;;
|
||||||
--install-grub)
|
--install-grub)
|
||||||
|
@ -142,6 +143,8 @@ if test -n "$pullManifest"; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$action" = pull ]; then exit 0; fi
|
||||||
|
|
||||||
|
|
||||||
# First build Nix, since NixOS may require a newer version than the
|
# First build Nix, since NixOS may require a newer version than the
|
||||||
# current one. Of course, the same goes for Nixpkgs, but Nixpkgs is
|
# current one. Of course, the same goes for Nixpkgs, but Nixpkgs is
|
||||||
|
|
Loading…
Reference in New Issue