From 2db6515213c0d4867770ff236f2005eec494010d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 4 Jul 2016 00:13:25 +0200
Subject: use buildbot from 15.09

---
 krebs/3modules/buildbot/master.nix | 9 ++++++++-
 krebs/5pkgs/default.nix            | 8 --------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index c365798f..f23981f4 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -2,7 +2,14 @@
 
 with config.krebs.lib;
 let
-  buildbot = pkgs.buildbot;
+
+  nixpkgs-1509 = import (pkgs.fetchFromGitHub {
+    owner = "NixOS"; repo = "nixpkgs-channels";
+    rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
+    sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
+  }) {};
+
+  buildbot = nixpkgs-1509.buildbot;
   buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
     # -*- python -*-
     from buildbot.plugins import *
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index f0bda0ee..cdab6421 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -38,14 +38,6 @@ with config.krebs.lib;
 
     ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
 
-    buildbot = callPackage <nixpkgs/pkgs/development/tools/build-managers/buildbot> {
-      inherit (pkgs.pythonPackages) twisted jinja2;
-      dateutil = pkgs.pythonPackages.dateutil_1_5;
-      sqlalchemy_migrate_0_7 = pkgs.pythonPackages.sqlalchemy_migrate_func (pkgs.pythonPackages.sqlalchemy7.override {
-        doCheck = false;
-      });
-    };
-
     # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
     symlinkJoin = { name, paths, ... }@args: let
       x = pkgs.symlinkJoin args;
-- 
cgit v1.2.3