delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

services.hydra -> services.hydra-dev

Browse source 
Since Nixpkgs 16.09 contains a Hydra module, we were getting a
conflict. I guess we should have a way to override modules in
Nixpkgs...
This commit is contained in:
Eelco Dolstra 2016-10-10 11:29:15 +02:00
parent 2f0d2f8d91
commit 633724cc8a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hydra-module.nix
View file

@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.hydra;
cfg = config.services.hydra-dev;
baseDir = "/var/lib/hydra";
@ -42,7 +42,7 @@ in
###### interface
options = {
services.hydra = rec {
services.hydra-dev = rec {
enable = mkOption {
type = types.bool;
@ -217,9 +217,9 @@ in
nix.trustedUsers = [ "hydra-queue-runner" ];
services.hydra.package = mkDefault ((import ./release.nix {}).build.x86_64-linux);
services.hydra-dev.package = mkDefault ((import ./release.nix {}).build.x86_64-linux);
services.hydra.extraConfig =
services.hydra-dev.extraConfig =
''
using_frontend_proxy 1
base_uri ${cfg.hydraURL}

8
release.nix
View file

@ -18,10 +18,10 @@ let
virtualisation.memorySize = 1024;
virtualisation.writableStore = true;
services.hydra.enable = true;
services.hydra.package = hydraPkg;
services.hydra.hydraURL = "http://hydra.example.org";
services.hydra.notificationSender = "admin@hydra.example.org";
services.hydra-dev.enable = true;
services.hydra-dev.package = hydraPkg;
services.hydra-dev.hydraURL = "http://hydra.example.org";
services.hydra-dev.notificationSender = "admin@hydra.example.org";
services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92;