From 633724cc8aecc8fe7e586f81444bfd8d290be411 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 10 Oct 2016 11:29:15 +0200
Subject: [PATCH] services.hydra -> services.hydra-dev

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...
---
 hydra-module.nix | 8 ++++----
 release.nix      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hydra-module.nix b/hydra-module.nix
index 81d13a10..916c9017 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -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}
diff --git a/release.nix b/release.nix
index 2828bced..1358ce09 100644
--- a/release.nix
+++ b/release.nix
@@ -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;