From 7aa31b7babafb2e10bbf8418800ef561bccbd67b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 25 Jul 2017 23:10:51 +0200
Subject: krebs buildbot: reintroduce packages with minimal overrides

---
 .../simple/buildbot-classic-slave/default.nix      | 21 ++++++++++
 krebs/5pkgs/simple/buildbot-classic/default.nix    | 47 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 krebs/5pkgs/simple/buildbot-classic-slave/default.nix
 create mode 100644 krebs/5pkgs/simple/buildbot-classic/default.nix

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
new file mode 100644
index 000000000..193df579f
--- /dev/null
+++ b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
@@ -0,0 +1,21 @@
+{ coreutils, fetchgit, fetchFromGitHub, buildbot-classic, python2Packages, ... }:
+
+python2Packages.buildPythonApplication {
+  name = "buildbot-slave-0.8.12";
+  namePrefix = "";
+
+  src = buildbot-classic.src;
+  postUnpack = "sourceRoot=\${sourceRoot}/slave";
+
+  patchPhase = ''
+    substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail
+  '';
+
+  propagatedBuildInputs = [ python2Packages.twisted ];
+  doCheck = false;
+
+  postInstall = ''
+    mkdir -p "$out/share/man/man1"
+    cp docs/buildslave.1 "$out/share/man/man1"
+  '';
+}
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
new file mode 100644
index 000000000..c28f77ef3
--- /dev/null
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -0,0 +1,47 @@
+{ fetchgit, fetchFromGitHub, python2Packages, ... }:
+let
+  # https://github.com/NixOS/nixpkgs/issues/14026
+  nixpkgs-fix = import (fetchgit {
+    url = https://github.com/nixos/nixpkgs;
+    rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
+    sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
+  }) {};
+
+in nixpkgs-fix.buildPythonApplication {
+  name = "buildbot-0.8.12";
+  namePrefix = "";
+  patches = [];
+
+  src = fetchFromGitHub {
+    owner = "krebscode";
+    repo = "buildbot-classic";
+    rev = "5b4f5f6f1";
+    sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93";
+  };
+  postUnpack = "sourceRoot=\${sourceRoot}/master";
+
+  patchPhase =
+    # The code insists on /usr/bin/tail, /usr/bin/make, etc.
+    '' echo "patching erroneous absolute path references..."
+       for i in $(find -name \*.py)
+       do
+         sed -i "$i" \
+             -e "s|/usr/bin/python|$(type -P python)|g ; s|/usr/bin/||g"
+       done
+
+      sed -i 's/==/>=/' setup.py
+    '';
+
+  propagatedBuildInputs = [
+    python2Packages.jinja2
+    python2Packages.twisted
+    nixpkgs-fix.pythonPackages.dateutil_1_5
+    nixpkgs-fix.pythonPackages.sqlalchemy_migrate_0_7
+  ];
+  doCheck = false;
+  postInstall = ''
+    mkdir -p "$out/share/man/man1"
+    cp docs/buildbot.1 "$out/share/man/man1"
+  '';
+}
+
-- 
cgit v1.2.3


From 423c6944bdd98552f6921bd139a93b8fb75fcd22 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 26 Jul 2017 00:12:46 +0200
Subject: buildbot -> buildbot-classic

---
 krebs/5pkgs/simple/buildbot-classic-slave/default.nix | 2 +-
 krebs/5pkgs/simple/buildbot-classic/default.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
index 193df579f..c316889e4 100644
--- a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
@@ -1,7 +1,7 @@
 { coreutils, fetchgit, fetchFromGitHub, buildbot-classic, python2Packages, ... }:
 
 python2Packages.buildPythonApplication {
-  name = "buildbot-slave-0.8.12";
+  name = "buildbot-classic-slave-0.8.12";
   namePrefix = "";
 
   src = buildbot-classic.src;
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index c28f77ef3..a3d924c4a 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -8,7 +8,7 @@ let
   }) {};
 
 in nixpkgs-fix.buildPythonApplication {
-  name = "buildbot-0.8.12";
+  name = "buildbot-classic-0.8.12";
   namePrefix = "";
   patches = [];
 
-- 
cgit v1.2.3


From cfff3729eac8d3ed72e51022b9cdb55dc94758a8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Jul 2017 20:38:18 +0200
Subject: populate: 1.2.0 -> 1.2.1

---
 krebs/5pkgs/simple/populate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix
index 3ec432229..c2ca00590 100644
--- a/krebs/5pkgs/simple/populate/default.nix
+++ b/krebs/5pkgs/simple/populate/default.nix
@@ -13,12 +13,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "populate";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchgit {
     url = http://cgit.ni.krebsco.de/populate;
     rev = "refs/tags/v${version}";
-    sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07";
+    sha256 = "13viizpmjkqxc3d9mk2bzspgnal07bma5m9lc90mcdlk36na3pkq";
   };
 
   phases = [
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/06300000.lock: No such file or directory (2)