From 80d72a7243408cfd1e31011f1f67a03fd4f27cc8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 25 Jul 2017 15:04:16 +0200
Subject: buildbot: override sources instead of repackage

---
 krebs/3modules/buildbot/master.nix | 16 +++++++++++++++-
 krebs/3modules/buildbot/slave.nix  | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules/buildbot')

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index dce3745d..12c685b8 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -2,8 +2,22 @@
 
 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.overrideDerivation (old: { 
+  postUnpack = "sourceRoot=\${sourceRoot}/master";
+  patches = [];
+  src = pkgs.fetchFromGitHub { 
+    owner = "krebscode";
+    repo = "buildbot-classic";
+    rev = "5b4f5f6f1";
+    sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; };});
 
-  buildbot = pkgs.buildbot-classic;
   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 345d4a3e..698bf3bc 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -2,7 +2,20 @@
 
 with import <stockholm/lib>;
 let
-  pkg = pkgs.buildbot-classic-slave;
+  # 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
 
-- 
cgit v1.2.3