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

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2013-01-23 15:47:42 +01:00
parent 3826fc5201
commit 60e36d3d1a
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
release.nix
View file

@ -2,13 +2,11 @@
, officialRelease ? false , officialRelease ? false
}: }:
rec { rec {
tarball = tarball =
with import <nixpkgs> { }; with import <nixpkgs> { };
let nix = nixUnstable; in
releaseTools.makeSourceTarball { releaseTools.makeSourceTarball {
name = "hydra-tarball"; name = "hydra-tarball";
src = hydraSrc; src = hydraSrc;
@ -16,7 +14,7 @@ rec {
version = builtins.readFile ./version; version = builtins.readFile ./version;
buildInputs = buildInputs =
[ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc git openssl]; [ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc git openssl ];
versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}"; versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}";
@ -41,6 +39,7 @@ rec {
''; '';
}; };
build = build =
{ system ? "x86_64-linux" }: { system ? "x86_64-linux" }:
@ -56,18 +55,19 @@ rec {
configureFlags = "--with-nix=${nix}"; configureFlags = "--with-nix=${nix}";
buildInputs = buildInputs =
[ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc sqlite git gitAndTools.topGit mercurial subversion bazaar openssl bzip2 ] [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc sqlite
++ (import ./deps.nix) { inherit pkgs; }; git gitAndTools.topGit mercurial subversion bazaar openssl bzip2
] ++ (import ./deps.nix) { inherit pkgs; };
hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ hydraPath = lib.makeSearchPath "bin" (
libxslt sqlite subversion openssh nix coreutils findutils [ libxslt sqlite subversion openssh nix coreutils findutils
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar
] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] ))); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
preConfigure = "patchShebangs ."; preConfigure = "patchShebangs .";
postInstall = '' postInstall = ''
ensureDir $out/nix-support mkdir -p $out/nix-support
nuke-refs $out/share/doc/hydra/manual/manual.pdf nuke-refs $out/share/doc/hydra/manual/manual.pdf
for i in $out/bin/*; do for i in $out/bin/*; do
@ -82,9 +82,7 @@ rec {
LOGNAME = "foo"; LOGNAME = "foo";
meta = { meta.description = "Build of Hydra on ${system}";
description = "Build of Hydra on ${system}";
};
}; };