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

* Remove the "tarball" jobset argument.

Browse source
This commit is contained in:
Eelco Dolstra 2010-08-16 13:01:31 +00:00
parent 12721a3a9a
commit 8ec6594d6d
1 changed files with 20 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
release.nix
View file

@ -1,4 +1,7 @@
{ nixpkgs ? ../nixpkgs }: { nixpkgs ? ../nixpkgs
, nix ? { outPath = ./.; rev = 1234; }
, 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 {
@ -60,17 +59,15 @@ let
build = build =
{ tarball ? jobs.tarball {} { system ? "i686-linux" }:
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;}; with import nixpkgs { inherit system; };
releaseTools.nixBuild { releaseTools.nixBuild {
name = "nix"; name = "nix";
src = tarball; src = tarball;
buildInputs = [curl perl bzip2 openssl]; buildInputs = [ curl perl bzip2 openssl ];
configureFlags = '' configureFlags = ''
--disable-init-state --disable-init-state
@ -79,41 +76,15 @@ let
}; };
/*
static =
{ tarball ? jobs.tarball {}
, system ? "i686-linux"
}:
with import nixpkgs {inherit system;};
releaseTools.binaryTarball {
name = "nix-static-tarball";
src = tarball;
buildInputs = [curl perl bzip2];
configureFlags = ''
--disable-init-state
--with-bzip2=${bzip2}
--enable-static-nix
'';
};
*/
coverage = coverage =
{ tarball ? jobs.tarball {} with import nixpkgs { system = "x86_64-linux"; };
}:
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
]; ];
@ -168,17 +139,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; };
}; };
@ -187,19 +156,17 @@ 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" ];
}; };