diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
commit | dc33419285c09720de70fe8edf5434736a2462b9 (patch) | |
tree | 58b20bca2075a06ad5b720c6ebf0dc55635e6b10 /pkgs/development/python-modules | |
parent | b59847b848079ba872e18b5f0683c1bff7e924ba (diff) | |
parent | b56c66e7e8565b16a4964840ef40243e07f78e84 (diff) | |
download | nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.gz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.bz2 nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.lz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.xz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.zst nixlib-dc33419285c09720de70fe8edf5434736a2462b9.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules')
6 files changed, 21 insertions, 26 deletions
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index f9a73d248315..2b2e703026d8 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, fetchpatch, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, @@ -25,17 +25,12 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.0"; + version = "2.8.1"; - # tests fail with the 2.8.0 sdist, so fetchFromGitHub instead - # https://github.com/buildbot/buildbot/pull/5322 - src = fetchFromGitHub { - owner = "buildbot"; - repo = "buildbot"; - rev = "v${version}"; - sha256 = "0akd61mgjp53c3vyf2yyzd0xf0cjwpvsi7g8pz72xrvnil1s4w7k"; + src = fetchPypi { + inherit pname version; + sha256 = "1nrbn8a2c56l5j0axmn9ijaviw0a6nrd34sg81r5j05mzzpb69is"; }; - sourceRoot = "./source/master"; propagatedBuildInputs = [ # core diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 12a7e99984f7..ebf8fb9c94e7 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,12 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.8.0"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; - sha256 = "09sf36h8q8wrp0n57nb9915k86qdjyjj4xpdzy8q4s9z121iw0xz"; + sha256 = "03ppmrnpyd77azylv1c673cffk6x53j9flx4i99k33bljmdy8iv4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index abb5d356540b..302615dc469c 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1xq7pqvvsvgd2n38yzk0bqx943ldxsldrdcldwjshazq831rbdbn"; + sha256 = "051y4z70dq0j343rb02wn3a1vkdbi8khjfib2msa80vdld3nxcyv"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ixq8x845glnykpab2z0vhwp69nbw98mg0df34kf32wjvm8j6kjh"; + sha256 = "0chw111j2c6ybvbb09x39zg7ghjz4ysw67wbpcmzd1v5jnwbaqdi"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1gn0amv8l0n0ny1x78g8x4rpfsnhcs9gkws2zw3nx78y4pbs6lw5"; + sha256 = "14v2lj65ccgmijxqrr61vpgba30q6w5vnisz78y3hbf3qpxmmd7g"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "04c0m4liyl4aaksq9x8wncasacfv0vgl0igafnhf440cf9lhkkwy"; + sha256 = "03q9am237f2r8ivqm1dfkyzm3bmns4xjn99c27ps6dw9an15f73a"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0c7lr4q3dvz3zhbnsvs2chsc6yn2jh10dnh1y66axdxk8hpqs3nc"; + sha256 = "0wv5ghsfmhkbk96zimihcwn16rxjz1q1g5ppahb8gfrclmzhdynl"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 4f77fb7ae069..936ef661eeee 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,13 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future, - coreutils }: +{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, + future, coreutils }: buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.8.0"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; - sha256 = "19pabha9jh3jnz9micfn5y4khnx4q6g1zc27wvfw6663mw6spykx"; + sha256 = "1cba1zmm3gfw3ikax7q4vbrxnvjxlby79x5lc4fg9c3igbm0nmwj"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 7293846178c9..e7942760b72c 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.1"; + version = "1.11.2"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0qackvhs35npgnga5riclnwqdwasc0kba48pwnrfxf0hm2i0kbgp"; + sha256 = "1gsvjgypjgw5a0k85kdvbbf7q6wspmv6z76acrgnidhav8sdn4dm"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 47a60acaa0af..e9f50420ca9e 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.4"; + version = "8.12.5"; src = fetchPypi { inherit pname version; - sha256 = "021dc6kdzqh9kkrsbs08x3ibmfm4xr9hqvdnsji6l0knw1zrkia6"; + sha256 = "09kww3fzn85gbj4lw8kqrppm9kq7nmy7b96p76sscamrpsdg31im"; }; meta = { |