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

* Simplify.

Browse source
This commit is contained in:
Eelco Dolstra 2010-03-05 17:52:43 +00:00
parent 82a325a8cd
commit 775c0d6423
1 changed files with 106 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
release.nix
View file

@ -1,15 +1,12 @@
let { nixpkgs ? ../nixpkgs
, hydraSrc ? {outPath = ./.; rev = 1234;}
jobs = rec {
tarball =
{ hydraSrc ? {outPath = ./.; rev = 1234;}
, nixpkgs ? ../nixpkgs
, officialRelease ? false , officialRelease ? false
}: }:
rec {
tarball =
with import nixpkgs {}; with import nixpkgs {};
releaseTools.makeSourceTarball { releaseTools.makeSourceTarball {
@ -58,10 +55,7 @@ let
build = build =
{ tarball ? jobs.tarball {} { system ? "x86_64-linux" }:
, nixpkgs ? ../nixpkgs
, system ? "x86_64-linux"
}:
let pkgs = import nixpkgs {inherit system;}; in let pkgs = import nixpkgs {inherit system;}; in
@ -70,7 +64,7 @@ let
let nix = nixSqlite; in let nix = nixSqlite; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hydra" + (if tarball ? version then "-" + tarball.version else ""); name = "hydra-${tarball.version}";
buildInputs = buildInputs =
[ perl makeWrapper libtool ] [ perl makeWrapper libtool ]
@ -121,7 +115,4 @@ let
}; };
}; };
}; }
in jobs