diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-23 00:21:59 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-23 00:21:59 +0100 |
commit | 9fb4205e2ceadb79a93cbe44bd77ebebe8c94625 (patch) | |
tree | b8e676c9a360eb47d78de6ec70f04f6c4dd0b546 /nixops/eldiron.nix | |
parent | 80a3e0559c86d4f1fc2523b30db8a3d568cf1888 (diff) | |
download | Nix-9fb4205e2ceadb79a93cbe44bd77ebebe8c94625.tar.gz Nix-9fb4205e2ceadb79a93cbe44bd77ebebe8c94625.tar.zst Nix-9fb4205e2ceadb79a93cbe44bd77ebebe8c94625.zip |
Add buildbot
Fixes https://git.immae.eu/mantisbt/view.php?id=74
Diffstat (limited to 'nixops/eldiron.nix')
-rw-r--r-- | nixops/eldiron.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index 5b70eb3..44d928b 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { privateFiles ? ./. }: | 1 | { privateFiles ? ./., nixpkgsNext ? null }: |
2 | { | 2 | { |
3 | network = { | 3 | network = { |
4 | description = "Immae's network"; | 4 | description = "Immae's network"; |
@@ -9,6 +9,7 @@ | |||
9 | with mylibs; | 9 | with mylibs; |
10 | { | 10 | { |
11 | _module.args = { | 11 | _module.args = { |
12 | pkgsNext = if builtins.isNull nixpkgsNext then pkgs else import nixpkgsNext {}; | ||
12 | mylibs = import ../libs.nix { nixpkgs = pkgs; }; | 13 | mylibs = import ../libs.nix { nixpkgs = pkgs; }; |
13 | mypkgs = import ../default.nix; | 14 | mypkgs = import ../default.nix; |
14 | myconfig = { | 15 | myconfig = { |
@@ -33,6 +34,7 @@ | |||
33 | ./modules/pub | 34 | ./modules/pub |
34 | ./modules/task | 35 | ./modules/task |
35 | ./modules/irc | 36 | ./modules/irc |
37 | ./modules/buildbot | ||
36 | ]; | 38 | ]; |
37 | services.myGitolite.enable = true; | 39 | services.myGitolite.enable = true; |
38 | services.myDatabases.enable = true; | 40 | services.myDatabases.enable = true; |
@@ -43,6 +45,7 @@ | |||
43 | services.irc.enable = true; | 45 | services.irc.enable = true; |
44 | services.pub.enable = true; | 46 | services.pub.enable = true; |
45 | services.myTasks.enable = true; | 47 | services.myTasks.enable = true; |
48 | services.buildbot.enable = true; | ||
46 | 49 | ||
47 | services.journald.extraConfig = '' | 50 | services.journald.extraConfig = '' |
48 | MaxLevelStore="warning" | 51 | MaxLevelStore="warning" |