From 020db0535b2ad9fb9b9a37fb62639bf34f6d0492 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Jul 2021 18:40:23 +0200 Subject: [PATCH 1/4] python3Packages.textfsm: 1.1.1 -> 1.1.2 --- .../python-modules/textfsm/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 04bc47913d8f..fed2f7c3e3fe 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -9,26 +9,25 @@ buildPythonPackage rec { pname = "textfsm"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm"; }; - patches = [ - (fetchpatch { - # remove pytest-runner dependency - url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; - sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; - }) + propagatedBuildInputs = [ + six + future ]; - propagatedBuildInputs = [ six future ]; - - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python module for parsing semi-structured text into python tables"; From 11c96d8bdf81cb64ae924fb86cc6f6d78f351172 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Jul 2021 18:42:27 +0200 Subject: [PATCH 2/4] python3Packages.token-bucket: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/token-bucket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index ac614d53fd5a..f1e90114ac6d 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "token-bucket"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "falconry"; repo = pname; rev = version; - sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s"; + sha256 = "0a703y2d09kvv2l9vq7vc97l4pi2wwq1f2hq783mbw2238jymb3m"; }; nativeBuildInputs = [ From 19066ea979b0406fa7b84edee751721594d81852 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Jul 2021 18:43:07 +0200 Subject: [PATCH 3/4] python3Packages.hijri-converter: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/hijri-converter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index d7ae17ed61a8..e9ce708b2cba 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "43b5ac566e7a7deeab364a2397e94405a65fd24ea786073eb3d4c740ebda7b9b"; + sha256 = "1cq67v0fjk7cd8kbppg2kl31a5i6jm8qrkcdqxx6vxwmx65l68ks"; }; checkInputs = [ pytestCheckHook ]; From bcd5b09634ff12cb426661c125b44984e27ef576 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 3 Jul 2021 20:09:34 +0200 Subject: [PATCH 4/4] pinnwand: relax token-bucket pin --- pkgs/servers/pinnwand/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 3962ce97110e..f8e3dfbc01c9 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'click = "^7.0"' 'click = "*"' \ --replace 'docutils = "^0.16"' 'docutils = "*"' \ - --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' + --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' \ + --replace 'token-bucket = "^0.2.0"' 'token-bucket = "*"' ''; nativeBuildInputs = [