diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-10 20:13:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-10 20:13:39 +0000 |
| commit | 393251bf8fa98292cecd05785a8c815fa762b3ea (patch) | |
| tree | ab59dcf3808e5a222c2501b51b636d876844e5d0 /nixpkgs/pkgs/development/tools/misc/hydra | |
| parent | 0e118743ce5edf9174a320050a7c0eea2199aaaa (diff) | |
| parent | 929cc78363e6878e044556bd291382eab37bcbed (diff) | |
| download | nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.gz nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.bz2 nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.lz nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.xz nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.zst nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.zip | |
Merge commit '929cc78363e6878e044556bd291382eab37bcbed'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/hydra')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/hydra/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 42da07baca66..00f679cfdac8 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,13 +1,17 @@ { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc +, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook }: with stdenv; +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + let isGreaterNix20 = with lib.versions; let @@ -34,8 +38,8 @@ let CatalystViewDownload CatalystViewJSON CatalystViewTT - CatalystXRoleApplicator CatalystXScriptServerStarman + CatalystXRoleApplicator CryptRandPasswd DBDPg DBDSQLite @@ -71,15 +75,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2018-08-07"; + version = "2019-02-01"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; - sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; + rev = "8b5948f4cf12424c04df67a6eb136c9846fb2cfd"; + sha256 = "0ldk3li394vykl9c4v9bs8pir05pmad24s0rx9bzqgz569zfj2iv"; }; buildInputs = @@ -88,6 +92,7 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests + nlohmann_json ] ++ lib.optionals isGreaterNix20 [ boost ]; hydraPath = lib.makeBinPath ( |