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

Remove the "system" jobset input

Browse source
This commit is contained in:
Eelco Dolstra 2013-03-15 13:18:49 +01:00
parent a68ebf8e37
commit 78d777ca15
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
release.nix
View file

@ -1,15 +1,19 @@
{ nixpkgs ? <nixpkgs> { nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
, nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
}: }:
let let
pkgs = import <nixpkgs> {};
systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" "i686-cygwin" "i686-solaris" ];
jobs = rec { jobs = rec {
tarball = tarball =
with import nixpkgs {}; with pkgs;
releaseTools.sourceTarball { releaseTools.sourceTarball {
name = "nix-tarball"; name = "nix-tarball";
@ -72,10 +76,9 @@ let
}; };
build = build = pkgs.lib.genAttrs systems (system:
{ system ? "x86_64-linux" }:
with import nixpkgs { inherit system; }; with import <nixpkgs> { inherit system; };
releaseTools.nixBuild { releaseTools.nixBuild {
name = "nix"; name = "nix";
@ -99,15 +102,16 @@ let
installFlags = "sysconfdir=$(out)/etc"; installFlags = "sysconfdir=$(out)/etc";
doInstallCheck = true; doInstallCheck = true;
}; });
binaryTarball =
binaryTarball = pkgs.lib.genAttrs systems (system:
{ system ? "x86_64-linux" }: { system ? "x86_64-linux" }:
with import nixpkgs { inherit system; }; with import <nixpkgs> { inherit system; };
let let
toplevel = build { inherit system; }; toplevel = builtins.getAttr system jobs.build;
version = toplevel.src.version; version = toplevel.src.version;
in in
@ -130,11 +134,11 @@ let
--transform "s,$TMPDIR/install,/usr/bin/nix-finish-install," \ --transform "s,$TMPDIR/install,/usr/bin/nix-finish-install," \
--transform "s,$TMPDIR/reginfo,/nix/store/reginfo," \ --transform "s,$TMPDIR/reginfo,/nix/store/reginfo," \
$TMPDIR/install $TMPDIR/reginfo $storePaths $TMPDIR/install $TMPDIR/reginfo $storePaths
''; '');
coverage = coverage =
with import nixpkgs { system = "x86_64-linux"; }; with import <nixpkgs> { system = "x86_64-linux"; };
releaseTools.coverageAnalysis { releaseTools.coverageAnalysis {
name = "nix-build"; name = "nix-build";
@ -205,7 +209,7 @@ let
makeRPM = makeRPM =
system: diskImageFun: prio: system: diskImageFun: prio:
with import nixpkgs { inherit system; }; with import <nixpkgs> { inherit system; };
releaseTools.rpmBuild rec { releaseTools.rpmBuild rec {
name = "nix-rpm"; name = "nix-rpm";
@ -224,7 +228,7 @@ let
makeDeb = makeDeb =
system: diskImageFun: prio: system: diskImageFun: prio:
with import nixpkgs { inherit system; }; with import <nixpkgs> { inherit system; };
releaseTools.debBuild { releaseTools.debBuild {
name = "nix-deb"; name = "nix-deb";