Author: eelco
Date: Wed Apr 18 11:46:16 2012
New Revision: 33825
URL: https://nixos.org/websvn/nix/?rev=33825&sc=1
Log:
* nixos-rebuild: don't do a pull of the manifest by default anymore.
It's not necessary when using the NixOS channel. "nixos-rebuild
pull" now pulls from the NixOS channel.
Modified:
nixos/trunk/modules/installer/tools/nixos-rebuild.sh
nixos/trunk/modules/installer/tools/tools.nix
Modified: nixos/trunk/modules/installer/tools/nixos-rebuild.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-rebuild.sh Wed Apr 18
10:59:57 2012 (r33824)
+++ nixos/trunk/modules/installer/tools/nixos-rebuild.sh Wed Apr 18
11:46:16 2012 (r33825)
@@ -18,19 +18,19 @@
build-vm-with-bootloader:
like build-vm, but include a boot loader in the VM
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:
--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
--no-build-nix don't build the latest Nix from Nixpkgs before
building NixOS
--rollback restore the previous NixOS configuration (only
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:
@@ -48,7 +48,7 @@
# Parse the command line.
extraBuildFlags=
action=
-pullManifest=1
+pullManifest=
buildNix=1
rollback=
@@ -64,8 +64,8 @@
--install-grub)
export NIXOS_INSTALL_GRUB=1
;;
- --no-pull)
- pullManifest=
+ --pull)
+ pullManifest=1
;;
--no-build-nix)
buildNix=
@@ -82,7 +82,6 @@
;;
--fast)
buildNix=
- pullManifest=
extraBuildFlags="$extraBuildFlags --show-trace"
;;
*)
@@ -99,7 +98,6 @@
fi
if test -n "$rollback"; then
- pullManifest=
buildNix=
fi
@@ -121,7 +119,7 @@
# Pull the manifests defined in the configuration (the "manifests"
# 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 \
| grep '<string' | sed 's^.*"\(.*\)".*^\1^g')
Modified: nixos/trunk/modules/installer/tools/tools.nix
==============================================================================
--- nixos/trunk/modules/installer/tools/tools.nix Wed Apr 18 10:59:57
2012 (r33824)
+++ nixos/trunk/modules/installer/tools/tools.nix Wed Apr 18 11:46:16
2012 (r33825)
@@ -94,10 +94,10 @@
};
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 =
[ 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 = ''
URLs of manifests to be downloaded when you run
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
