diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-23 00:41:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-23 00:41:37 +0000 |
| commit | 6c1bb54483b3110d611a46ba0617c84100a2e3a0 (patch) | |
| tree | 40925f36c02afdec197ad7c8c5514e01dec41488 /release.nix | |
| parent | 72990dae376fe5fc4fe8083239c1f713b2dd08a8 (diff) | |
| download | nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.gz nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.bz2 nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.lz nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.xz nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.zst nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.zip | |
* In the installation CD, make the NixOS/Nixpkgs available as if they
were obtained from the NixOS channel. "nixos-install" copies this to the installed system as well. * In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for the benefit of memory-constrained environments. svn path=/nixos/trunk/; revision=33887
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/release.nix b/release.nix index 2ee090f86ae..11276fa695a 100644 --- a/release.nix +++ b/release.nix @@ -114,11 +114,7 @@ let buildInputs = [ nixUnstable ]; - expr = - '' - { system ? builtins.currentSystem }: - { pkgs = (import nixpkgs/default.nix { inherit system; }) // { recurseForDerivations = true; }; } - ''; + expr = builtins.readFile lib/channel-expr.nix; distPhase = '' echo -n $VERSION_SUFFIX > .version-suffix @@ -128,7 +124,6 @@ let cp -prd . ../$releaseName/nixos cp -prd ${nixpkgs} ../$releaseName/nixpkgs echo "$expr" > ../$releaseName/default.nix - echo nixos > ../$releaseName/channel-name NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null cd .. chmod -R u+w $releaseName |