Add buildbot

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

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 5dff7d4674203b58c7af6f5be83e8aea93b23f77..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,7 +9,8 @@
     with mylibs;
   {
     _module.args = {
-      mylibs = import ../libs.nix;
+      pkgsNext = if builtins.isNull nixpkgsNext then pkgs else import nixpkgsNext {};
+      mylibs = import ../libs.nix { nixpkgs = pkgs; };
       mypkgs = import ../default.nix;
       myconfig = {
         inherit privateFiles;
@@ -30,6 +31,10 @@
       ./modules/websites
       ./modules/mail
       ./modules/ftp
+      ./modules/pub
+      ./modules/task
+      ./modules/irc
+      ./modules/buildbot
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
@@ -37,6 +42,10 @@
     services.myWebsites.integration.enable = true;
     services.myWebsites.tools.enable = true;
     services.pure-ftpd.enable = true;
+    services.irc.enable = true;
+    services.pub.enable = true;
+    services.myTasks.enable = true;
+    services.buildbot.enable = true;
 
     services.journald.extraConfig = ''
       MaxLevelStore="warning"