mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
Merge pull request #52536 from lopsided98/buildbot-update
buildbot: 1.4.0 -> 1.8.1
This commit is contained in:
commit
71d66c58a5
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
|
||||
python, twisted, jinja2, zope_interface, future, sqlalchemy,
|
||||
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
|
||||
txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
|
||||
flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
|
||||
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
|
||||
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
|
||||
isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
|
||||
|
||||
let
|
||||
withPlugins = plugins: buildPythonPackage {
|
||||
@ -24,11 +24,11 @@ let
|
||||
|
||||
package = buildPythonPackage rec {
|
||||
pname = "buildbot";
|
||||
version = "1.5.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52";
|
||||
sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -43,6 +43,7 @@ let
|
||||
txaio
|
||||
autobahn
|
||||
pyjwt
|
||||
pyyaml
|
||||
|
||||
# tls
|
||||
twisted.extras.tls
|
||||
@ -71,13 +72,16 @@ let
|
||||
./skip_test_linux_distro.patch
|
||||
];
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
postPatch = ''
|
||||
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
|
||||
'';
|
||||
|
||||
# TimeoutErrors on slow machines -> aarch64
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
|
||||
preCheck = ''
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
export PATH="$out/bin:$PATH"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "buildbot-pkg";
|
||||
version = "1.4.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06f4jvczbg9km0gfmcd1ljplf5w8za27i9ap9jnyqgh3j77smd7a";
|
||||
sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v";
|
||||
sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r";
|
||||
sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7";
|
||||
sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
@ -67,7 +67,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd";
|
||||
sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
@ -87,7 +87,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz";
|
||||
sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage (rec {
|
||||
pname = "buildbot-worker";
|
||||
version = "1.4.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy";
|
||||
sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ twisted future ];
|
||||
|
@ -5,11 +5,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-migrate";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
|
||||
sha256 = "1bngmbcry97kwhrxwm0d74zg9qg7gmiws6rd78xshyfgpcqdmylc";
|
||||
};
|
||||
|
||||
# See: https://review.openstack.org/#/c/608382/
|
||||
|
Loading…
Reference in New Issue
Block a user