svn path=/nixos/trunk/; revision=14478

This commit is contained in:
Eelco Dolstra 2009-03-09 21:10:53 +00:00
parent 88fd4080b2
commit 1e947b7acd

View file

@ -1,3 +1,5 @@
{ nixpkgs ? ../nixpkgs-wc }:
let let
@ -5,12 +7,11 @@ let
tarball = tarball =
{ nixosSrc ? {path = ./.; rev = 1234;} { nixosSrc ? {outPath = ./.; rev = 1234;}
, nixpkgs ? {path = ../nixpkgs-wc;}
, officialRelease ? false , officialRelease ? false
}: }:
with import nixpkgs.path {}; with import nixpkgs {};
releaseTools.makeSourceTarball { releaseTools.makeSourceTarball {
name = "nixos-tarball"; name = "nixos-tarball";
@ -34,23 +35,21 @@ let
manual = manual =
{ nixosSrc ? {path = ./.; rev = 1234;} { nixosSrc ? {path = ./.; rev = 1234;}
, nixpkgs ? {path = ../nixpkgs-wc;}
, officialRelease ? false , officialRelease ? false
}: }:
import "${nixosSrc.path}/doc/manual" { import "${nixosSrc.path}/doc/manual" {
nixpkgsPath = nixpkgs.path; nixpkgsPath = nixpkgs.outPath;
}; };
iso = iso =
{ nixosSrc ? {path = ./.; rev = 1234;} { nixosSrc ? {path = ./.; rev = 1234;}
, nixpkgs ? {path = ../nixpkgs-wc;}
, officialRelease ? false , officialRelease ? false
, system ? "i686-linux" , system ? "i686-linux"
}: }:
with import nixpkgs.path {inherit system;}; with import nixpkgs {inherit system;};
let let
@ -59,7 +58,7 @@ let
iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" { iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
platform = system; platform = system;
compressImage = true; compressImage = true;
nixpkgsPath = nixpkgs.path; nixpkgsPath = nixpkgs.outPath;
relName = "nixos-${version}"; relName = "nixos-${version}";
}).rescueCD; }).rescueCD;