diff options
| -rw-r--r-- | nixos/modules/services/continuous-integration/hydra/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 43fec5ff5bb2..2fa7c59a965d 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -28,6 +28,7 @@ let serverEnv = env // { HYDRA_TRACKER = cfg.tracker; + XDG_CACHE_HOME = "${baseDir}/www/.cache"; COLUMNS = "80"; PGPASSFILE = "${baseDir}/pgpass-www"; # grrr } // (optionalAttrs cfg.debugServer { DBIC_TRACE = "1"; }); @@ -225,14 +226,14 @@ in services.hydra.extraConfig = '' - using_frontend_proxy 1 - base_uri ${cfg.hydraURL} - notification_sender ${cfg.notificationSender} - max_servers 25 + using_frontend_proxy = 1 + base_uri = ${cfg.hydraURL} + notification_sender = ${cfg.notificationSender} + max_servers = 25 ${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"} ''; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index e8ebc617d198..613a4fec8530 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -62,15 +62,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-10-26"; + version = "2017-11-21"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "2cdc84f34f4de647dd89c5ef503782a3a48ff623"; - sha256 = "1gcp22ldyc914aik4yhlzy60ym7z8513pvp0ag5637j44nz0rf7h"; + rev = "b7bc4384b7b471d1ddf892cb03f16189a66d5a0d"; + sha256 = "05g37z3ilazzqa5rqj5zljndwxjbvpc18xibh6jlwjwpvg3kpbbh"; }; buildInputs = |