k 5 buildbot: update to 0.9.4

3 files changed, 5 insertions, 47 deletions

diff --git a/krebs/5pkgs/buildbot/default.nix b/krebs/5pkgs/buildbot/default.nix
index 2e14b6b6..37eea5fd 100644
--- a/krebs/5pkgs/buildbot/default.nix
+++ b/krebs/5pkgs/buildbot/default.nix
@@ -3,10 +3,10 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.1";
+  version = "0.9.4";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "1kk4dlkk4rznwid9xykq2lbzksvkcr4r5kmz9hgh5hswdzv8bwx9";
+    sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086";
   };
   doCheck = false;
   buildInputs = with pythonPackages; [
@@ -22,6 +22,7 @@ pythonPackages.buildPythonApplication (rec {
     pylint
     astroid
     pyflakes
+    pyjwt
   ];
 
   propagatedBuildInputs = with pythonPackages; [
@@ -55,9 +56,6 @@ pythonPackages.buildPythonApplication (rec {
 
   ] ++ plugins;
 
-  patchPhase = ''
-    patch -p1 < ${./irc_messages.patch}
-  '';
   preInstall = ''
     # writes out a file that can't be read properly
     sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
diff --git a/krebs/5pkgs/buildbot/irc_messages.patch b/krebs/5pkgs/buildbot/irc_messages.patch
deleted file mode 100644
index ab8597db..00000000
--- a/krebs/5pkgs/buildbot/irc_messages.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/buildbot/reporters/words.py b/master/buildbot/reporters/words.py
-index a65147b..bf44118 100644
---- a/buildbot/reporters/words.py
-+++ b/buildbot/reporters/words.py
-@@ -550,14 +550,15 @@ class Contact(service.AsyncService):
- 
-         if self.useRevisions:
-             revisions = yield self.getRevisionsForBuild(build)
--            r = "Hey! build %s containing revision(s) [%s] is complete: %s" % \
-+            r = "Build %s containing revision(s) [%s] is complete: %s" % \
-                 (builderName, ','.join(revisions), results[0])
-         else:
--            r = "Hey! build %s #%d is complete: %s" % \
-+            r = "Build %s #%d is complete: %s" % \
-                 (builderName, buildNumber, results[0])
- 
-         r += ' [%s]' % maybeColorize(build['state_string'],
-                                      results[1], self.useColors)
-+        r += " - %s" % self.master.status.getURLForBuild(builder['builderid'],buildNumber)
-         self.send(r)
- 
-         # FIXME: where do we get the list of changes for a build ?
-@@ -622,14 +623,15 @@ class Contact(service.AsyncService):
-         results = self.getResultsDescriptionAndColor(build['results'])
-         if self.useRevisions:
-             revisions = yield self.getRevisionsForBuild(build)
--            r = "Hey! build %s containing revision(s) [%s] is complete: %s" % \
-+            r = "Build %s containing revision(s) [%s] is complete: %s" % \
-                 (builder_name, ','.join(revisions), results[0])
-         else:
--            r = "Hey! build %s #%d is complete: %s" % \
-+            r = "Build %s #%d is complete: %s" % \
-                 (builder_name, buildnum, results[0])
- 
-         r += ' [%s]' % maybeColorize(build['state_string'],
-                                      results[1], self.useColors)
-+        r += " - %s" % self.master.status.getURLForBuild(builder['builderid'],buildNumber)
-         self.send(r)
- 
-         # FIXME: where do we get the base_url? Then do we use the build Link to
diff --git a/krebs/5pkgs/buildbot/worker.nix b/krebs/5pkgs/buildbot/worker.nix
index c100de5d..34e52685 100644
--- a/krebs/5pkgs/buildbot/worker.nix
+++ b/krebs/5pkgs/buildbot/worker.nix
@@ -2,12 +2,12 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.1";
+  version = "0.9.4";
 
   doCheck = false;
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "00p9l1qz6mx12npjwsycp8f9a8f2har15ig79pfsg8z7a7yw93hx";
+    sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];