3 files changed, 19 insertions, 5 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 6c7af6da5..12c685b82 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -2,7 +2,6 @@
 
 with import <stockholm/lib>;
 let
-
   # https://github.com/NixOS/nixpkgs/issues/14026
   nixpkgs-fix = import (pkgs.fetchgit {
     url = https://github.com/nixos/nixpkgs;
@@ -10,7 +9,15 @@ let
     sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
   }) {};
 
-  buildbot = nixpkgs-fix.buildbot;
+  buildbot = nixpkgs-fix.buildbot.overrideDerivation (old: { 
+  postUnpack = "sourceRoot=\${sourceRoot}/master";
+  patches = [];
+  src = pkgs.fetchFromGitHub { 
+    owner = "krebscode";
+    repo = "buildbot-classic";
+    rev = "5b4f5f6f1";
+    sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; };});
+
   buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
     # -*- python -*-
     from buildbot.plugins import *
diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix
index 932923ae5..698bf3bcd 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -2,12 +2,20 @@
 
 with import <stockholm/lib>;
 let
+  # https://github.com/NixOS/nixpkgs/issues/14026
   nixpkgs-fix = import (pkgs.fetchgit {
     url = https://github.com/nixos/nixpkgs;
     rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
     sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
   }) {};
-
+  pkg = nixpkgs-fix.buildbot-slave.overrideDerivation (old: { 
+  postUnpack = "sourceRoot=\${sourceRoot}/slave";
+  patches = [];
+  src = pkgs.fetchFromGitHub { 
+    owner = "krebscode";
+    repo = "buildbot-classic";
+    rev = "5b4f5f6f1";
+    sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; };});
   buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
     import os
 
@@ -158,7 +166,7 @@ let
         workdir = shell.escape cfg.workDir;
         contact = shell.escape cfg.contact;
         description = shell.escape cfg.description;
-        buildbot = nixpkgs-fix.buildbot-slave;
+        buildbot = pkg;
         # TODO:make this
       in {
         PermissionsStartOnly = true;
diff --git a/makefu/1systems/shoney/config.nix b/makefu/1systems/shoney/config.nix
index 6cec260d2..ba9d0911e 100644
--- a/makefu/1systems/shoney/config.nix
+++ b/makefu/1systems/shoney/config.nix
@@ -14,7 +14,6 @@ in {
     <stockholm/makefu/2configs/hw/CAC.nix>
     <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
     <stockholm/makefu/2configs/tinc/retiolum.nix>
-    <stockholm/makefu/2configs/torrent.nix>
   ];