diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-10 22:17:37 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-10 22:17:37 +0000 |
commit | fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9 (patch) | |
tree | 5be6e2e2cc0a93ac73317a4d87c8b1529df304fe | |
parent | 322a0ff7cde238c1302ecec0f35edc3b486daa63 (diff) | |
download | nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.tar nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.tar.gz nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.tar.bz2 nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.tar.lz nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.tar.xz nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.tar.zst nixpkgs-fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9.zip |
* In nixos-install, do a nix-pull from
http://nixos.org/releases/nixos/nixos-<version> to ensure we're getting the right binaries. svn path=/nixos/trunk/; revision=33738
-rw-r--r-- | modules/installer/cd-dvd/installation-cd-base.nix | 2 | ||||
-rw-r--r-- | modules/installer/tools/nixos-install.sh | 4 | ||||
-rw-r--r-- | modules/installer/tools/tools.nix | 10 | ||||
-rw-r--r-- | modules/profiles/installation-device.nix | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix index 8601975254b..9111ac37385 100644 --- a/modules/installer/cd-dvd/installation-cd-base.nix +++ b/modules/installer/cd-dvd/installation-cd-base.nix @@ -44,6 +44,8 @@ in isoImage.volumeID = "NIXOS_CD_${config.system.nixosVersion}"; + installer.nixosURL = "http://nixos.org/releases/nixos/nixos-${config.system.nixosVersion}"; + boot.postBootCommands = '' export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh index 475b84ade03..ebe3413de2f 100644 --- a/modules/installer/tools/nixos-install.sh +++ b/modules/installer/tools/nixos-install.sh @@ -37,8 +37,8 @@ fi # Do a nix-pull to speed up building. -if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then - @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true +if test -n "@nixosURL@" -a ${NIXOS_PULL:-1} != 0; then + @nix@/bin/nix-pull @nixosURL@/MANIFEST || true fi diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix index d2f54b27c73..9eecb9d803a 100644 --- a/modules/installer/tools/tools.nix +++ b/modules/installer/tools/tools.nix @@ -23,10 +23,10 @@ let inherit (pkgs) perl pathsFromGraph; nix = config.environment.nix; - nixpkgsURL = cfg.nixpkgsURL; + nixosURL = cfg.nixosURL; nixClosure = pkgs.runCommand "closure" - {exportReferencesGraph = ["refs" config.environment.nix];} + { exportReferencesGraph = ["refs" config.environment.nix]; } "cp refs $out"; }; @@ -84,9 +84,9 @@ in { options = { - installer.nixpkgsURL = pkgs.lib.mkOption { - default = ""; - example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577; + installer.nixosURL = pkgs.lib.mkOption { + default = http://nixos.org/releases/nixos/channels/nixos-unstable; + example = http://nixos.org/releases/nixos/nixos-0.1pre1234; description = '' URL of the Nixpkgs distribution to use when building the installation CD. diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix index d56cec64a0c..60bd20d3970 100644 --- a/modules/profiles/installation-device.nix +++ b/modules/profiles/installation-device.nix @@ -115,10 +115,6 @@ in # the full glibcLocales package. i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"]; - # nixos-install will do a pull from this channel to speed up the - # installation. - installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable; - boot.postBootCommands = '' # Provide a mount point for nixos-install. |