summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/pornocauster.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-29 19:24:01 +0100
committerlassulus <lass@aidsballs.de>2015-12-29 19:24:01 +0100
commit42380546976c15d99dc0e9a65607ba4aafb31590 (patch)
tree4b0ae218de102219e9865ae4da65cef8490fafaa /makefu/1systems/pornocauster.nix
parentf22fe4e5d97237dbe76bc856909950487634c7be (diff)
parent676d0f748138f0e1fa3cb2177b5a08a857f17fac (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
-rw-r--r--makefu/1systems/pornocauster.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 28b77d330..690e26b36 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -26,6 +26,7 @@
# services
../2configs/git/brain-retiolum.nix
../2configs/tor.nix
+ # ../2configs/buildbot-standalone.nix
# hardware specifics are in here
../2configs/hw/tp-x220.nix
@@ -36,14 +37,14 @@
];
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
- buildbot = let
- pkgs1509 = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
- in pkgs1509.buildbot;
};
- makefu.buildbot.master.enable = true;
- #krebs.Reaktor.enable = true;
- #krebs.Reaktor.nickname = "makefu|r";
+ krebs.Reaktor = {
+ enable = true;
+ nickname = "makefu|r";
+ plugins = with pkgs.ReaktorPlugins; [ nixos-version random-emoji ];
+ };
+
# nix.binaryCaches = [ "http://acng.shack/nixos" "https://cache.nixos.org" ];
environment.systemPackages = with pkgs;[