Merge pull request #66840 from lopsided98/buildbot-update

buildbot: 2.3.1 -> 2.4.0
This commit is contained in:
Dmitry Kalinkin 2019-08-19 05:02:34 -04:00 committed by GitHub
commit d022202b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 32 deletions

@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized,
glibcLocales }: git, glibcLocales }:
let let
withPlugins = plugins: buildPythonPackage { withPlugins = plugins: buildPythonPackage {
@ -25,11 +25,11 @@ let
package = buildPythonPackage rec { package = buildPythonPackage rec {
pname = "buildbot"; pname = "buildbot";
version = "2.3.1"; version = "2.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg"; sha256 = "141ad2g1j5y0n5cdnd18m55ss0gqjlz5ky85rb6qfn73dgw42vmz";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -37,7 +37,6 @@ let
twisted twisted
jinja2 jinja2
zope_interface zope_interface
future
sqlalchemy sqlalchemy
sqlalchemy_migrate sqlalchemy_migrate
dateutil dateutil
@ -65,6 +64,7 @@ let
buildbot-worker buildbot-worker
buildbot-pkg buildbot-pkg
parameterized parameterized
git
glibcLocales glibcLocales
]; ];
@ -95,7 +95,7 @@ let
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";
maintainers = with maintainers; [ nand0p ryansydnor ]; maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}; };

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "buildbot-pkg"; pname = "buildbot-pkg";
version = "2.3.1"; version = "2.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5"; sha256 = "0na336jwibgbix8fr4jki1gqys44kkm0a8q32llcr2z08igs4mvy";
}; };
postPatch = '' postPatch = ''
@ -18,7 +18,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot Packaging Helper"; description = "Buildbot Packaging Helper";
maintainers = with maintainers; [ nand0p ryansydnor ]; maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
} }

@ -1,23 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg }: { lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg, mock }:
{ {
www = buildPythonPackage rec { www = buildPythonPackage rec {
pname = "buildbot_www"; pname = "buildbot-www";
inherit (buildbot-pkg) version; inherit (buildbot-pkg) version;
# NOTE: wheel is used due to buildbot circular dependency
format = "wheel";
src = fetchPypi { src = fetchPypi {
inherit pname version format; inherit pname version;
python = "py3"; sha256 = "0g3m5z8yska245r1x9n85b4br8b63i4zca2qn3qspf62b1wzmxmd";
sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w";
}; };
buildInputs = [ buildbot buildbot-pkg mock ];
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot UI"; description = "Buildbot UI";
maintainers = with maintainers; [ nand0p ryansydnor ]; maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}; };
@ -28,16 +26,16 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra"; sha256 = "0p7az9mb09c4bl0j37w28wflzygq9vy8rjbbnhlfbs6py6mjdagr";
}; };
propagatedBuildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
checkInputs = [ buildbot ]; checkInputs = [ buildbot ];
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot Console View Plugin"; description = "Buildbot Console View Plugin";
maintainers = with maintainers; [ nand0p ryansydnor ]; maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}; };
@ -48,16 +46,16 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll"; sha256 = "0ba0a7q7ii7sipvifxs9ldkcs4b975skndarmirbphc797993hj1";
}; };
propagatedBuildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
checkInputs = [ buildbot ]; checkInputs = [ buildbot ];
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot Waterfall View Plugin"; description = "Buildbot Waterfall View Plugin";
maintainers = with maintainers; [ nand0p ryansydnor ]; maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}; };
@ -68,16 +66,16 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj"; sha256 = "0dvchhjzmfbbrxqm8dlmwck22z99pgnflxk3cyn0wbb1qskhd9cv";
}; };
propagatedBuildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
checkInputs = [ buildbot ]; checkInputs = [ buildbot ];
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot Grid View Plugin"; description = "Buildbot Grid View Plugin";
maintainers = with maintainers; [ nand0p ]; maintainers = with maintainers; [ nand0p lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}; };
@ -88,16 +86,16 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28"; sha256 = "0w9p3y89rqsmqiacwj2avir42r0xjr2yri14v3ay6yar5391r8wa";
}; };
propagatedBuildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
checkInputs = [ buildbot ]; checkInputs = [ buildbot ];
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot WSGI dashboards Plugin"; description = "Buildbot WSGI dashboards Plugin";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}; };

@ -3,11 +3,11 @@
buildPythonPackage (rec { buildPythonPackage (rec {
pname = "buildbot-worker"; pname = "buildbot-worker";
version = "2.3.1"; version = "2.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52"; sha256 = "04dk1jg0yq0rcm7j7pn7l1pqqjhiyvwppnhc1b7106sx2cdj2yb2";
}; };
propagatedBuildInputs = [ twisted future ]; propagatedBuildInputs = [ twisted future ];
@ -22,7 +22,7 @@ buildPythonPackage (rec {
meta = with lib; { meta = with lib; {
homepage = http://buildbot.net/; homepage = http://buildbot.net/;
description = "Buildbot Worker Daemon"; description = "Buildbot Worker Daemon";
maintainers = with maintainers; [ nand0p ryansydnor ]; maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
}) })