Skip to content

Commit

Permalink
buildbot: 2.3.0 -> 2.3.1 (#63644)
Browse files Browse the repository at this point in the history
  • Loading branch information
lopsided98 authored and veprbl committed Jun 23, 2019
1 parent 69b4d4b commit 203ea0d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildbot/default.nix
Expand Up @@ -25,11 +25,11 @@ let

package = buildPythonPackage rec {
pname = "buildbot";
version = "2.3.0";
version = "2.3.1";

src = fetchPypi {
inherit pname version;
sha256 = "1fdahbpihs93pj640y2079yilca6w7vlwirfcz221885ih148257";
sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg";
};

propagatedBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildbot/pkg.nix
Expand Up @@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "buildbot-pkg";
version = "2.3.0";
version = "2.3.1";

src = fetchPypi {
inherit pname version;
sha256 = "1ajgvnhwvryi10q9bklpfazi7vxw2my9jlqgwnjccycbr6yznzsw";
sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5";
};

postPatch = ''
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/python-modules/buildbot/plugins.nix
Expand Up @@ -11,7 +11,7 @@
src = fetchPypi {
inherit pname version format;
python = "py3";
sha256 = "134b8y498bq5fp4863hj9058wr7mcw0xgl74br0f1dy9n7jdcl39";
sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w";
};

meta = with lib; {
Expand All @@ -28,7 +28,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "1yh8xij3wizz0f88chjpdijm7i35ql87g84ph3f76sqyr6aj6ckw";
sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra";
};

propagatedBuildInputs = [ buildbot-pkg ];
Expand All @@ -48,7 +48,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "04iihy1s9r4n5jlk57pdjy3yvp6zym2iv2bgqjhw6fy0hff5j8ys";
sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll";
};

propagatedBuildInputs = [ buildbot-pkg ];
Expand All @@ -68,7 +68,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "0bcilhcz9xnr8799d5j4sm6qz8pdjlckdck7a282nfs64liajsrh";
sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj";
};

propagatedBuildInputs = [ buildbot-pkg ];
Expand All @@ -88,7 +88,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "13lr7lzi9sv0s6xrfalq0dkcys6fp7hn0787rjhnz9gc7x83aqjv";
sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28";
};

propagatedBuildInputs = [ buildbot-pkg ];
Expand Down
10 changes: 6 additions & 4 deletions pkgs/development/python-modules/buildbot/worker.nix
@@ -1,20 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }:
{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future,
coreutils }:

buildPythonPackage (rec {
pname = "buildbot-worker";
version = "2.3.0";
version = "2.3.1";

src = fetchPypi {
inherit pname version;
sha256 = "0nldf4ws1nrkhbapxiy2s8j9fjfbkhp17c5912p6qy3ximfcfa93";
sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52";
};

propagatedBuildInputs = [ twisted future ];

checkInputs = [ setuptoolsTrial mock ];

postPatch = ''
substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
substituteInPlace buildbot_worker/scripts/logwatcher.py \
--replace /usr/bin/tail "${coreutils}/bin/tail"
'';

meta = with lib; {
Expand Down

0 comments on commit 203ea0d

Please sign in to comment.