JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #147279 from lopsided98/buildbot-update

Browse Source 
buildbot: 3.3.0 -> 3.4.0
This commit is contained in:
Fabian Affolter 2021-11-24 19:34:43 +01:00 committed by GitHub
commit c2a13efb47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 21 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,9 +1,9 @@
{ 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
, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins
, parameterized, git, openssh, glibcLocales, ldap3, nixosTests
, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil
, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3
, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker
, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales
, nixosTests
}:
let
@ -31,11 +31,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "3.3.0";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE=";
sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk=";
};
propagatedBuildInputs = [
@ -44,7 +44,7 @@ let
jinja2
zope_interface
sqlalchemy
sqlalchemy-migrate
alembic
python-dateutil
txaio
autobahn
@ -74,9 +74,6 @@ let
git
openssh
glibcLocales
# optional dependency that was accidentally made required for tests
# https://github.com/buildbot/buildbot/pull/5857
ldap3
];
patches = [

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

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

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

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U=";
sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw=";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE=";
sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs=";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c=";
sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc=";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M=";
sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE=";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU=";
sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc=";
};
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-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU=";
sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU=";
};
propagatedBuildInputs = [ twisted future ];

13
pkgs/development/python-modules/pyramid_mako/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, webtest
, pyramid
, Mako
@ -15,6 +16,15 @@ buildPythonPackage rec {
sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2";
};
patches = [
# Fix tests with pyramid >= 2.0
# https://github.com/Pylons/pyramid_mako/pull/54
(fetchpatch {
url = "https://github.com/Pylons/pyramid_mako/commit/c0f9e7e0146a7f94e35a9401b1519ac8b7765f5b.patch";
sha256 = "15swfm0a07bdl32s85426rmjh72jwfasjcrl849ppg035z75q9fx";
})
];
buildInputs = [ webtest ];
propagatedBuildInputs = [ pyramid Mako ];
@ -23,8 +33,5 @@ buildPythonPackage rec {
description = "Mako template bindings for the Pyramid web framework";
license = licenses.bsd0;
maintainers = with maintainers; [];
# broken on pyramid>=2.0
# https://github.com/Pylons/pyramid_mako/issues/53
broken = true;
};
}