diff options
| author | lewo <lewo@abesis.fr> | 2019-12-29 10:28:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-29 10:28:44 +0100 |
| commit | 885c4cc97c9fdae18236d0623cfee812fac1d349 (patch) | |
| tree | 1d481e0929cae0c60fd78b518776f1026a63c63d | |
| parent | c69b4f8e9ce80c1c23aaece84f9ad20fb02a4407 (diff) | |
| parent | 875ec0a70717fadfe451f14727fbc5418afe4d84 (diff) | |
| download | nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.tar nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.tar.gz nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.tar.bz2 nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.tar.lz nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.tar.xz nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.tar.zst nixpkgs-885c4cc97c9fdae18236d0623cfee812fac1d349.zip | |
Merge pull request #76151 from Ma27/bump-hydra
hydra: 2019-08-30 -> 2019-11-13
| -rw-r--r-- | nixos/tests/hydra/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 37e14cb19cc..1c0ed3369b1 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -30,7 +30,7 @@ let callTest = f: f { inherit system pkgs; }; hydraPkgs = { - inherit (pkgs) nixStable nixUnstable; + inherit (pkgs) nixStable nixUnstable nixFlakes; }; tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix: diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f8b04af3f97..e0ebba4c051 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -27,7 +27,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystRuntime + CatalystPluginUnicodeEncoding CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -51,6 +51,7 @@ let LWP LWPProtocolHttps NetAmazonS3 + NetPrometheus NetStatsd PadWalker Readonly @@ -58,6 +59,8 @@ let SetScalar Starman SysHostnameLong + TermSizeAny + TestMore TextDiff TextTable XMLSimple @@ -69,15 +72,15 @@ let }; in stdenv.mkDerivation rec { pname = "hydra"; - version = "2019-08-30"; + version = "2019-11-13"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = pname; - rev = "242b8b7a314759ed33f69205d26a1b7c337511e0"; - sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84"; + rev = "20dd0bbe6a90d9066e635ee82e98efec23b17e51"; + sha256 = "06chiaa7p54zxngmy2q3ps7bbiqpdv9h2rfmprh83qz36xps9rs2"; }; buildInputs = |