From a4382f83ec341f664b49995653ebc96a38c850df Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 28 Jul 2017 23:47:07 +0200
Subject: buildbot-classic: guess version name with git

---
 krebs/5pkgs/simple/buildbot-classic/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index a3d924c4a..3cb766e92 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, fetchFromGitHub, python2Packages, ... }:
+{ fetchgit, fetchFromGitHub, python2Packages, git, ... }:
 let
   # https://github.com/NixOS/nixpkgs/issues/14026
   nixpkgs-fix = import (fetchgit {
@@ -8,7 +8,7 @@ let
   }) {};
 
 in nixpkgs-fix.buildPythonApplication {
-  name = "buildbot-classic-0.8.12";
+  name = "buildbot-classic-0.8.13";
   namePrefix = "";
   patches = [];
 
@@ -19,7 +19,7 @@ in nixpkgs-fix.buildPythonApplication {
     sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93";
   };
   postUnpack = "sourceRoot=\${sourceRoot}/master";
-
+  nativeBuildInputs = [ nixpkgs-fix.git ];
   patchPhase =
     # The code insists on /usr/bin/tail, /usr/bin/make, etc.
     '' echo "patching erroneous absolute path references..."
@@ -32,11 +32,11 @@ in nixpkgs-fix.buildPythonApplication {
       sed -i 's/==/>=/' setup.py
     '';
 
-  propagatedBuildInputs = [
-    python2Packages.jinja2
-    python2Packages.twisted
-    nixpkgs-fix.pythonPackages.dateutil_1_5
-    nixpkgs-fix.pythonPackages.sqlalchemy_migrate_0_7
+  propagatedBuildInputs = with nixpkgs-fix.pythonPackages; [
+    jinja2
+    twisted
+    dateutil_1_5
+    sqlalchemy_migrate_0_7
   ];
   doCheck = false;
   postInstall = ''
-- 
cgit v1.2.3


From 1b5ab3384c7f1b695551d288a7464c6e838fee1f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 29 Jul 2017 00:20:50 +0200
Subject: buildbot-classic: use fetchgit for version detection

---
 krebs/5pkgs/simple/buildbot-classic/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index 3cb766e92..ab98c9fd6 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -12,14 +12,15 @@ in nixpkgs-fix.buildPythonApplication {
   namePrefix = "";
   patches = [];
 
-  src = fetchFromGitHub {
-    owner = "krebscode";
-    repo = "buildbot-classic";
-    rev = "5b4f5f6f1";
-    sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93";
+  src = fetchgit {
+    url = "https://github.com/krebscode/buildbot-classic";
+    rev = "211ec7815";
+    sha256 = "09q8wyci7p07lrngjblwnpyxk0wddf8jzabwf598a7yiam6yc4cm";
+    leaveDotGit = true;
+
   };
   postUnpack = "sourceRoot=\${sourceRoot}/master";
-  nativeBuildInputs = [ nixpkgs-fix.git ];
+  buildInputs = [ git ];
   patchPhase =
     # The code insists on /usr/bin/tail, /usr/bin/make, etc.
     '' echo "patching erroneous absolute path references..."
-- 
cgit v1.2.3


From ca33cce6101091075fdffbb866eda58b40b0334e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 29 Jul 2017 00:28:54 +0200
Subject: buildbot-classic-slave: version detection with git

---
 krebs/5pkgs/simple/buildbot-classic-slave/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
index c316889e4..bbc824a6a 100644
--- a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
@@ -1,16 +1,15 @@
-{ coreutils, fetchgit, fetchFromGitHub, buildbot-classic, python2Packages, ... }:
+{ coreutils, fetchgit, git, buildbot-classic, python2Packages, ... }:
 
 python2Packages.buildPythonApplication {
-  name = "buildbot-classic-slave-0.8.12";
+  name = "buildbot-classic-slave-0.8.13";
   namePrefix = "";
 
   src = buildbot-classic.src;
   postUnpack = "sourceRoot=\${sourceRoot}/slave";
 
-  patchPhase = ''
-    substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail
-  '';
+  patchPhase = ":";
 
+  nativeBuildInputs = [ git ];
   propagatedBuildInputs = [ python2Packages.twisted ];
   doCheck = false;
 
-- 
cgit v1.2.3


From 17497235e84985f9b2ec4acda47f15a9fe68453e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 29 Jul 2017 00:38:07 +0200
Subject: buildbot-classic: fix hash of src

---
 krebs/5pkgs/simple/buildbot-classic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index ab98c9fd6..353972109 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -15,7 +15,7 @@ in nixpkgs-fix.buildPythonApplication {
   src = fetchgit {
     url = "https://github.com/krebscode/buildbot-classic";
     rev = "211ec7815";
-    sha256 = "09q8wyci7p07lrngjblwnpyxk0wddf8jzabwf598a7yiam6yc4cm";
+    sha256 = "0cyn406r31qdqhpsih7w83x47b443svpgfhxqd6w3iryv0y1z95i";
     leaveDotGit = true;
 
   };
-- 
cgit v1.2.3