cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #132229 from lopsided98/buildbot-update

Browse source 
buildbot: 3.2.0 -> 3.3.0
This commit is contained in:
Ben Siraphob 2021-08-01 00:32:23 +07:00 committed by GitHub
commit e276c3b9c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/python-modules/buildbot/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
, python, twisted, jinja2, zope_interface, sqlalchemy
, sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
@ -26,11 +26,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.2.0";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA=";
sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE=";
};
propagatedBuildInputs = [
@ -78,19 +78,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
# Fix compatibility with SQLAlchemy 1.4
(fetchpatch {
url = "https://github.com/buildbot/buildbot/pull/6156.patch";
sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my";
stripLen = 1;
excludes = [
".bbtravis.yml"
"buildbot/test/unit/db/test_enginestrategy.py"
"buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py"
"requirements-ci.txt"
"requirements-cidb.txt"
];
})
];
postPatch = ''

2
pkgs/development/python-modules/buildbot/pkg.nix
View file

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk=";
sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs=";
};
postPatch = ''

10
pkgs/development/python-modules/buildbot/plugins.nix
View file

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0=";
sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U=";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk=";
sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE=";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8=";
sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c=";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo=";
sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M=";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0=";
sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU=";
};
buildInputs = [ buildbot-pkg ];

2
pkgs/development/python-modules/buildbot/worker.nix
View file

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo=";
sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU=";
};
propagatedBuildInputs = [ twisted future ];