From 7db5d59018f4096b0cc39afa59df53b6a1fa9353 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 5 Aug 2017 00:13:41 +0200
Subject: buildbot: remove nixpkgs-fix

buildbot master cannot be run as forking anymore
we start it as --nodaemon as normal type
---
 krebs/3modules/buildbot/master.nix              |  6 +-----
 krebs/5pkgs/simple/buildbot-classic/default.nix | 27 ++++++++++---------------
 2 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index a7624c8f2..a02f3645d 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -341,8 +341,6 @@ let
         secretsdir = shell.escape (toString <secrets>);
       in {
         PermissionsStartOnly = true;
-        Type = "forking";
-        PIDFile = "${workdir}/twistd.pid";
         # TODO: maybe also prepare buildbot.tac?
         ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
           set -efux
@@ -366,9 +364,7 @@ let
           chmod 700 -R ${workdir}
           chown buildbotMaster:buildbotMaster -R ${workdir}
         '';
-        ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start ${workdir}";
-        ExecStop = "${pkgs.buildbot-classic}/bin/buildbot stop ${workdir}";
-        ExecReload = "${pkgs.buildbot-classic}/bin/buildbot reconfig ${workdir}";
+        ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start --nodaemon ${workdir}";
         PrivateTmp = "true";
         User = "buildbotMaster";
         Restart = "always";
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index 353972109..f723e7255 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -1,21 +1,14 @@
-{ fetchgit, fetchFromGitHub, python2Packages, git, ... }:
-let
-  # https://github.com/NixOS/nixpkgs/issues/14026
-  nixpkgs-fix = import (fetchgit {
-    url = https://github.com/nixos/nixpkgs;
-    rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
-    sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
-  }) {};
+{ pkgs, fetchgit, fetchFromGitHub, python2Packages, git, ... }:
 
-in nixpkgs-fix.buildPythonApplication {
+python2Packages.buildPythonApplication {
   name = "buildbot-classic-0.8.13";
   namePrefix = "";
   patches = [];
 
   src = fetchgit {
     url = "https://github.com/krebscode/buildbot-classic";
-    rev = "211ec7815";
-    sha256 = "0cyn406r31qdqhpsih7w83x47b443svpgfhxqd6w3iryv0y1z95i";
+    rev = "da5c0204e";
+    sha256 = "12aaq8ir9k7n2x9m2jnpcs4rr3pcixncbd3bm36ndh93n80q1z3j";
     leaveDotGit = true;
 
   };
@@ -33,11 +26,13 @@ in nixpkgs-fix.buildPythonApplication {
       sed -i 's/==/>=/' setup.py
     '';
 
-  propagatedBuildInputs = with nixpkgs-fix.pythonPackages; [
-    jinja2
-    twisted
-    dateutil_1_5
-    sqlalchemy_migrate_0_7
+  propagatedBuildInputs = [
+    python2Packages.jinja2
+    python2Packages.twisted
+    python2Packages.dateutil_1_5
+    python2Packages.sqlalchemy_migrate
+    python2Packages.pysqlite
+    pkgs.coreutils
   ];
   doCheck = false;
   postInstall = ''
-- 
cgit v1.2.3