Add buildbot

[perso/Immae/Config/Nix.git] / nixops / eldiron.nix

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 5b70eb3dccc643d2f7edbea61c6c6c925b134e55..44d928b06a6ed5d1f9e2d99dd063f0d0065e0ff3 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -1,4 +1,4 @@
-{ privateFiles ? ./. }:
+{ privateFiles ? ./., nixpkgsNext ? null }:
 {
   network = {
     description = "Immae's network";
@@ -9,6 +9,7 @@
     with mylibs;
   {
     _module.args = {
+      pkgsNext = if builtins.isNull nixpkgsNext then pkgs else import nixpkgsNext {};
       mylibs = import ../libs.nix { nixpkgs = pkgs; };
       mypkgs = import ../default.nix;
       myconfig = {
@@ -33,6 +34,7 @@
       ./modules/pub
       ./modules/task
       ./modules/irc
+      ./modules/buildbot
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
@@ -43,6 +45,7 @@
     services.irc.enable = true;
     services.pub.enable = true;
     services.myTasks.enable = true;
+    services.buildbot.enable = true;
 
     services.journald.extraConfig = ''
       MaxLevelStore="warning"