Author: eelco Date: Tue Apr 10 22:17:37 2012 New Revision: 33738 URL: https://nixos.org/websvn/nix/?rev=33738&sc=1
Log: * In nixos-install, do a nix-pull from http://nixos.org/releases/nixos/nixos-<version> to ensure we're getting the right binaries. Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix nixos/trunk/modules/installer/tools/nixos-install.sh nixos/trunk/modules/installer/tools/tools.nix nixos/trunk/modules/profiles/installation-device.nix Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix ============================================================================== --- nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Tue Apr 10 21:46:08 2012 (r33737) +++ nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Tue Apr 10 22:17:37 2012 (r33738) @@ -44,6 +44,8 @@ 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 Modified: nixos/trunk/modules/installer/tools/nixos-install.sh ============================================================================== --- nixos/trunk/modules/installer/tools/nixos-install.sh Tue Apr 10 21:46:08 2012 (r33737) +++ nixos/trunk/modules/installer/tools/nixos-install.sh Tue Apr 10 22:17:37 2012 (r33738) @@ -37,8 +37,8 @@ # 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 Modified: nixos/trunk/modules/installer/tools/tools.nix ============================================================================== --- nixos/trunk/modules/installer/tools/tools.nix Tue Apr 10 21:46:08 2012 (r33737) +++ nixos/trunk/modules/installer/tools/tools.nix Tue Apr 10 22:17:37 2012 (r33738) @@ -23,10 +23,10 @@ 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 @@ { 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. Modified: nixos/trunk/modules/profiles/installation-device.nix ============================================================================== --- nixos/trunk/modules/profiles/installation-device.nix Tue Apr 10 21:46:08 2012 (r33737) +++ nixos/trunk/modules/profiles/installation-device.nix Tue Apr 10 22:17:37 2012 (r33738) @@ -115,10 +115,6 @@ # 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. _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
