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

Merge pull request #76151 from Ma27/bump-hydra 

hydra: 2019-08-30 -> 2019-11-13
This commit is contained in:
lewo 2019-12-29 10:28:44 +01:00 committed by GitHub
parent c69b4f8e9c 875ec0a707
commit 885c4cc97c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/hydra/default.nix
View File

@ -30,7 +30,7 @@ let
callTest = f: f { inherit system pkgs; }; callTest = f: f { inherit system pkgs; };
hydraPkgs = { hydraPkgs = {
inherit (pkgs) nixStable nixUnstable; inherit (pkgs) nixStable nixUnstable nixFlakes;
}; };
tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix: tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:

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

@ -27,7 +27,7 @@ let
CatalystPluginSessionStateCookie CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace CatalystPluginStackTrace
CatalystRuntime CatalystPluginUnicodeEncoding
CatalystTraitForRequestProxyBase CatalystTraitForRequestProxyBase
CatalystViewDownload CatalystViewDownload
CatalystViewJSON CatalystViewJSON
@ -51,6 +51,7 @@ let
LWP LWP
LWPProtocolHttps LWPProtocolHttps
NetAmazonS3 NetAmazonS3
NetPrometheus
NetStatsd NetStatsd
PadWalker PadWalker
Readonly Readonly
@ -58,6 +59,8 @@ let
SetScalar SetScalar
Starman Starman
SysHostnameLong SysHostnameLong
TermSizeAny
TestMore
TextDiff TextDiff
TextTable TextTable
XMLSimple XMLSimple
@ -69,15 +72,15 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "hydra"; pname = "hydra";
version = "2019-08-30"; version = "2019-11-13";
inherit stdenv; inherit stdenv;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = pname; repo = pname;
rev = "242b8b7a314759ed33f69205d26a1b7c337511e0"; rev = "20dd0bbe6a90d9066e635ee82e98efec23b17e51";
sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84"; sha256 = "06chiaa7p54zxngmy2q3ps7bbiqpdv9h2rfmprh83qz36xps9rs2";
}; };
buildInputs = buildInputs =