Merge remote-tracking branch 'cd/master'

1 files changed, 2 insertions, 22 deletions

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index d95362919..90b490802 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -18,27 +18,8 @@
     tinc = pkgs.tinc_pre;
   };
 
-  makefu.buildbot.master = {
-    enable = false;
-    irc = {
-      enable = true;
-      server = "cd.retiolum";
-      channel = "retiolum";
-      allowForce = true;
-    };
-  };
-  # services.logstash.enable = true;
-  makefu.buildbot.slave = {
-    enable = false;
-    masterhost = "localhost";
-    username = "testslave";
-    password = "krebspass";
-    packages = with pkgs;[ git nix ];
-    extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
-  };
-
-  krebs.build.source.git.nixpkgs = {
-    #url = https://github.com/nixos/nixpkgs;
+  krebs.build.source.nixpkgs = {
+    # url = https://github.com/nixos/nixpkgs;
     # HTTP Everywhere + libredir
     rev = "8239ac6";
   };
@@ -71,7 +52,6 @@
   krebs.retiolum = {
     enable = true;
     extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000";
-    hosts = ../../krebs/Zhosts;
     connectTo = [
       "gum"
     ];