diff options
| author | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
| commit | 2ae2bdc586177f674a987e354940765ad86cbaa2 (patch) | |
| tree | 0ba9baf9ff358a9eb2bb1111090d513b93268df7 /makefu/1systems/pornocauster.nix | |
| parent | 780ddec4ab268fbfd43ea9bf511ed4b3b0d35783 (diff) | |
| parent | 49b6fd9c87678893ed47794b116660700994b1bc (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 13 |
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;[ |