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

hydra: 2017-10-26 -> 2017-11-21

This commit is contained in:
Domen Kožar 2017-11-22 17:24:55 +00:00
parent e0779e6aed
commit ad492e6f33
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -28,6 +28,7 @@ let
serverEnv = env // serverEnv = env //
{ HYDRA_TRACKER = cfg.tracker; { HYDRA_TRACKER = cfg.tracker;
XDG_CACHE_HOME = "${baseDir}/www/.cache";
COLUMNS = "80"; COLUMNS = "80";
PGPASSFILE = "${baseDir}/pgpass-www"; # grrr PGPASSFILE = "${baseDir}/pgpass-www"; # grrr
} // (optionalAttrs cfg.debugServer { DBIC_TRACE = "1"; }); } // (optionalAttrs cfg.debugServer { DBIC_TRACE = "1"; });
@ -225,14 +226,14 @@ in
services.hydra.extraConfig = services.hydra.extraConfig =
'' ''
using_frontend_proxy 1 using_frontend_proxy = 1
base_uri ${cfg.hydraURL} base_uri = ${cfg.hydraURL}
notification_sender ${cfg.notificationSender} notification_sender = ${cfg.notificationSender}
max_servers 25 max_servers = 25
${optionalString (cfg.logo != null) '' ${optionalString (cfg.logo != null) ''
hydra_logo ${cfg.logo} hydra_logo = ${cfg.logo}
''} ''}
gc_roots_dir ${cfg.gcRootsDir} gc_roots_dir = ${cfg.gcRootsDir}
use-substitutes = ${if cfg.useSubstitutes then "1" else "0"} use-substitutes = ${if cfg.useSubstitutes then "1" else "0"}
''; '';

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

@ -62,15 +62,15 @@ let
}; };
in releaseTools.nixBuild rec { in releaseTools.nixBuild rec {
name = "hydra-${version}"; name = "hydra-${version}";
version = "2017-10-26"; version = "2017-11-21";
inherit stdenv; inherit stdenv;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "hydra"; repo = "hydra";
rev = "2cdc84f34f4de647dd89c5ef503782a3a48ff623"; rev = "b7bc4384b7b471d1ddf892cb03f16189a66d5a0d";
sha256 = "1gcp22ldyc914aik4yhlzy60ym7z8513pvp0ag5637j44nz0rf7h"; sha256 = "05g37z3ilazzqa5rqj5zljndwxjbvpc18xibh6jlwjwpvg3kpbbh";
}; };
buildInputs = buildInputs =