bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Simplify.

Browse source
This commit is contained in:
Eelco Dolstra 2010-03-10 13:07:37 +00:00
parent 1a65142ec4
commit 03afc34805
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
release.nix
View file

@ -1,4 +1,7 @@
{ nixpkgs ? ../nixpkgs }: { nix ? {outPath = ./.; rev = 1234;}
, nixpkgs ? ../nixpkgs
, officialRelease ? false
}:
let let
@ -6,10 +9,6 @@ let
tarball = tarball =
{ nix ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
}:
with import nixpkgs {}; with import nixpkgs {};
releaseTools.sourceTarball { releaseTools.sourceTarball {
@ -66,9 +65,7 @@ let
build = build =
{ tarball ? jobs.tarball {} { system ? "i686-linux" }:
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;}; with import nixpkgs {inherit system;};
@ -86,17 +83,14 @@ let
coverage = coverage =
{ tarball ? jobs.tarball {}
}:
with import nixpkgs {}; with import nixpkgs {};
releaseTools.coverageAnalysis { releaseTools.coverageAnalysis {
name = "nix-build"; name = "nix-build";
src = tarball; src = tarball;
buildInputs = [ buildInputs =
curl perl bzip2 openssl [ curl perl bzip2 openssl
# These are for "make check" only: # These are for "make check" only:
graphviz libxml2 libxslt graphviz libxml2 libxslt
]; ];
@ -151,17 +145,15 @@ let
makeRPM = makeRPM =
system: diskImageFun: prio: system: diskImageFun: prio:
{ tarball ? jobs.tarball {}
}:
with import nixpkgs {inherit system;}; with import nixpkgs {inherit system;};
releaseTools.rpmBuild rec { releaseTools.rpmBuild rec {
name = "nix-rpm-${diskImage.name}"; name = "nix-rpm-${diskImage.name}";
src = tarball; src = jobs.tarball;
diskImage = diskImageFun vmTools.diskImages; diskImage = diskImageFun vmTools.diskImages;
memSize = 1024; memSize = 1024;
meta = { schedulingPriority = toString prio; }; meta.schedulingPriority = prio;
}; };
@ -170,17 +162,15 @@ let
makeDeb = makeDeb =
system: diskImageFun: prio: system: diskImageFun: prio:
{ tarball ? jobs.tarball {}
}:
with import nixpkgs {inherit system;}; with import nixpkgs {inherit system;};
releaseTools.debBuild { releaseTools.debBuild {
name = "nix-deb"; name = "nix-deb";
src = tarball; src = jobs.tarball;
diskImage = diskImageFun vmTools.diskImages; diskImage = diskImageFun vmTools.diskImages;
memSize = 1024; memSize = 1024;
meta = { schedulingPriority = toString prio; }; meta.schedulingPriority = prio;
configureFlags = "--sysconfdir=/etc"; configureFlags = "--sysconfdir=/etc";
debRequires = ["curl"]; debRequires = ["curl"];
}; };