From 6d7dfa388e34e3ea43ebaaaa273d008a141ee503 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Jul 2017 23:05:25 +0200
Subject: buildbot: cherry-pick working buildbot-classic definition from
 nixpkgs

---
 krebs/3modules/buildbot/master.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'krebs/3modules/buildbot/master.nix')

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 6c7af6da..432b93b0 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -3,14 +3,7 @@
 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";
-  }) {};
-
-  buildbot = nixpkgs-fix.buildbot;
+  buildbot = pkgs.buildbot;
   buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
     # -*- python -*-
     from buildbot.plugins import *
-- 
cgit v1.2.3