diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/buildbot/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/buildbot/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index f4c5bfb16221..52a43d0d1137 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, - python, twisted, jinja2, zope_interface, future, sqlalchemy, - sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, + python, twisted, jinja2, zope_interface, sqlalchemy, + sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, - parameterized, git, openssh, glibcLocales, nixosTests }: + parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: let withPlugins = plugins: buildPythonPackage { name = "${package.name}-with-plugins"; phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = '' @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.10.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0jmgpvgn36kfc1sa27a1l1g26dawhl99a1wl8gn4ajbcbcvc2pkh"; + sha256 = "1b9m9l8bz2slkrq0l5z8zd8pd0js5w4k7dam8bdp00kv3aln4si9"; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ let autobahn pyjwt pyyaml + unidiff ] # tls ++ twisted.extras.tls; @@ -67,6 +68,9 @@ let git openssh glibcLocales + # optional dependency that was accidentally made required for tests + # https://github.com/buildbot/buildbot/pull/5857 + ldap3 ]; patches = [ |