public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hydra: 2016-04-15 -> 2016-12-09

Browse Source 
Fixes #19396 #21424
This commit is contained in:
Domen Kožar 2017-01-08 14:38:35 +01:00
parent 9653be493a
commit 8940c68c09
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/tools/misc/hydra/default.nix
View File

@ -3,7 +3,7 @@
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, fetchpatch }: , rpm, dpkg, cdrkit, fetchpatch, pixz }:
with stdenv; with stdenv;
@ -61,21 +61,17 @@ let
}; };
in releaseTools.nixBuild rec { in releaseTools.nixBuild rec {
name = "hydra-${version}"; name = "hydra-${version}";
version = "2016-04-15"; version = "2016-12-09";
inherit stdenv;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "hydra"; repo = "hydra";
rev = "177bf25d648092826a75369191503a3f2bb763a4"; rev = "de55303197d997c4fc5503b52b1321ae9528583d";
sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl"; sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
}; };
patches = [(fetchpatch {
name = "cmath.diff";
url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337
sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0";
})];
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
@ -96,7 +92,7 @@ in releaseTools.nixBuild rec {
]; ];
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
[ libxslt sqlite subversion openssh nixUnstable coreutils findutils [ sqlite subversion openssh nixUnstable coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
@ -108,7 +104,7 @@ in releaseTools.nixBuild rec {
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
preHook = '' preHook = ''
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
PERL5LIB=$(pwd)/src/lib:$PERL5LIB; PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -7592,7 +7592,7 @@ in
hwloc = callPackage ../development/libraries/hwloc {}; hwloc = callPackage ../development/libraries/hwloc {};
hydra = callPackage ../development/tools/misc/hydra {}; hydra = callPackage ../development/tools/misc/hydra { stdenv = overrideCC stdenv gcc6; };
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };