* Simplify.

This commit is contained in:
Eelco Dolstra 2010-03-05 17:52:43 +00:00
parent 82a325a8cd
commit 775c0d6423

View file

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