diff options
| author | Domen Kožar <domen@dev.si> | 2016-10-09 17:43:01 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-11-29 14:12:03 +0100 |
| commit | 50c387722d7c733cabb0cd5f71a6e1575997a44c (patch) | |
| tree | 280a28a3ac324844f679d0d575d7d37b89fa3bbf | |
| parent | nixUnstable: bump to 2016-11-28 (diff) | |
| download | nixpkgs-origin/hydraBump.tar.gz | |
hydra: 2016-04-15 -> 2016-11-24origin/hydraBump
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index e3d2c4950bcd..1cdb6d6aeea4 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -61,21 +61,17 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2016-04-15"; + version = "2016-10-09"; + + inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "177bf25d648092826a75369191503a3f2bb763a4"; - sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl"; + rev = "96dc9ccecb48754ed13624ec930a429f0177e643"; + sha256 = "0skl26hhbcjm2bv7b2d6xdpaihrsffgwx7h5xzslps3ndan5adis"; }; - patches = [(fetchpatch { - name = "cmath.diff"; - url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337 - sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0"; - })]; - buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 187e8de8e7c8..6a5dc6b62764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7448,7 +7448,7 @@ in 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 { }; |