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

* nixos-rebuild: don't do a pull of the manifest by default anymore.

Browse Source 
It's not necessary when using the NixOS channel.  "nixos-rebuild
  pull" now pulls from the NixOS channel.

svn path=/nixos/trunk/; revision=33825
This commit is contained in:
Eelco Dolstra 2012-04-18 11:46:16 +00:00
parent 6abf3c8a97
commit 395d73db70
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,19 +18,19 @@ The operation is one of the following:
build-vm-with-bootloader: build-vm-with-bootloader:
like build-vm, but include a boot loader in the VM like build-vm, but include a boot loader in the VM
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 pull: just pull the NixOS channel manifest and exit
Options: Options:
--install-grub (re-)install the Grub bootloader --install-grub (re-)install the Grub bootloader
--no-pull don't do a nix-pull to get the latest Nixpkgs --pull do do a nix-pull to get the latest NixOS
channel manifest channel manifest
--no-build-nix don't build the latest Nix from Nixpkgs before --no-build-nix don't build the latest Nix from Nixpkgs before
building NixOS building NixOS
--rollback restore the previous NixOS configuration (only --rollback restore the previous NixOS configuration (only
with switch, boot, test, build) with switch, boot, test, build)
--fast same as --no-pull --no-build-nix --show-trace --fast same as --no-build-nix --show-trace
Various nix-build options are also accepted, in particular: Various nix-build options are also accepted, in particular:
@ -48,7 +48,7 @@ EOF
# Parse the command line. # Parse the command line.
extraBuildFlags= extraBuildFlags=
action= action=
pullManifest=1 pullManifest=
buildNix=1 buildNix=1
rollback= rollback=
@ -64,8 +64,8 @@ while test "$#" -gt 0; do
--install-grub) --install-grub)
export NIXOS_INSTALL_GRUB=1 export NIXOS_INSTALL_GRUB=1
;; ;;
--no-pull) --pull)
pullManifest= pullManifest=1
;; ;;
--no-build-nix) --no-build-nix)
buildNix= buildNix=
@ -82,7 +82,6 @@ while test "$#" -gt 0; do
;; ;;
--fast) --fast)
buildNix= buildNix=
pullManifest=
extraBuildFlags="$extraBuildFlags --show-trace" extraBuildFlags="$extraBuildFlags --show-trace"
;; ;;
*) *)
@ -99,7 +98,6 @@ if test "$action" = dry-run; then
fi fi
if test -n "$rollback"; then if test -n "$rollback"; then
pullManifest=
buildNix= buildNix=
fi fi
@ -121,7 +119,7 @@ fi
# Pull the manifests defined in the configuration (the "manifests" # Pull the manifests defined in the configuration (the "manifests"
# attribute). Wonderfully hacky. # attribute). Wonderfully hacky.
if test -n "$pullManifest"; then if [ -n "$pullManifest" -o "$action" = pull ]; then
manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \ manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
| grep '<string' | sed 's^.*"\(.*\)".*^\1^g') | grep '<string' | sed 's^.*"\(.*\)".*^\1^g')

4
modules/installer/tools/tools.nix
View File

@ -94,10 +94,10 @@ in
}; };
installer.manifests = pkgs.lib.mkOption { installer.manifests = pkgs.lib.mkOption {
default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST]; default = [ http://nixos.org/releases/nixos/channels/nixos-unstable/MANIFEST ];
example = example =
[ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST http://nixos.org/releases/nixos/channels/nixos-stable/MANIFEST
]; ];
description = '' description = ''
URLs of manifests to be downloaded when you run URLs of manifests to be downloaded when you run