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

* In nixos-install, do a nix-pull from

Browse Source 
http://nixos.org/releases/nixos/nixos-<version> to ensure we're
  getting the right binaries.

svn path=/nixos/trunk/; revision=33738
This commit is contained in:
Eelco Dolstra 2012-04-10 22:17:37 +00:00
parent 322a0ff7cd
commit fb0a54b803
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -44,6 +44,8 @@ in
isoImage.volumeID = "NIXOS_CD_${config.system.nixosVersion}"; isoImage.volumeID = "NIXOS_CD_${config.system.nixosVersion}";
installer.nixosURL = "http://nixos.org/releases/nixos/nixos-${config.system.nixosVersion}";
boot.postBootCommands = boot.postBootCommands =
'' ''
export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH

4
modules/installer/tools/nixos-install.sh
View File

@ -37,8 +37,8 @@ fi
# Do a nix-pull to speed up building. # Do a nix-pull to speed up building.
if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then if test -n "@nixosURL@" -a ${NIXOS_PULL:-1} != 0; then
@nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true @nix@/bin/nix-pull @nixosURL@/MANIFEST || true
fi fi

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

@ -23,10 +23,10 @@ let
inherit (pkgs) perl pathsFromGraph; inherit (pkgs) perl pathsFromGraph;
nix = config.environment.nix; nix = config.environment.nix;
nixpkgsURL = cfg.nixpkgsURL; nixosURL = cfg.nixosURL;
nixClosure = pkgs.runCommand "closure" nixClosure = pkgs.runCommand "closure"
{exportReferencesGraph = ["refs" config.environment.nix];} { exportReferencesGraph = ["refs" config.environment.nix]; }
"cp refs $out"; "cp refs $out";
}; };
@ -84,9 +84,9 @@ in
{ {
options = { options = {
installer.nixpkgsURL = pkgs.lib.mkOption { installer.nixosURL = pkgs.lib.mkOption {
default = ""; default = http://nixos.org/releases/nixos/channels/nixos-unstable;
example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577; example = http://nixos.org/releases/nixos/nixos-0.1pre1234;
description = '' description = ''
URL of the Nixpkgs distribution to use when building the URL of the Nixpkgs distribution to use when building the
installation CD. installation CD.

4
modules/profiles/installation-device.nix
View File

@ -115,10 +115,6 @@ in
# the full glibcLocales package. # the full glibcLocales package.
i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"]; 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 = boot.postBootCommands =
'' ''
# Provide a mount point for nixos-install. # Provide a mount point for nixos-install.