diff options
Diffstat (limited to 'pkgs/development/python-modules/buildbot/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/buildbot/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 8d8e5ec00dc..de34be979f3 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, 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.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74"; + sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA="; }; propagatedBuildInputs = [ @@ -78,6 +78,19 @@ 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 = '' @@ -97,6 +110,7 @@ let passthru = { inherit withPlugins; tests.buildbot = nixosTests.buildbot; + updateScript = ./update.sh; }; meta = with lib; { |