From c7961565fd6d5c1d692eba9c2da3d27c7e813625 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 10 Feb 2023 19:04:52 -0300 Subject: [PATCH 1/5] python311Packages.aiocache: 0.11.1 -> 0.12.0 Release: https://github.com/aio-libs/aiocache/releases/tag/v0.12.0 Diff: https://github.com/aio-libs/aiocache/compare/0.11.1...v0.12.0 --- pkgs/development/python-modules/aiocache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54979dbd7ba4..7ca49b495f1c 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aiocache"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + rev = "v${version}"; + sha256 = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; propagatedBuildInputs = [ From 35a23cf4e9a4ad16ca7913f1c8023121c8a43b1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:11:01 +0100 Subject: [PATCH 2/5] python311Packages.aiocache: update meta - disable on unsupported Python releases --- .../python-modules/aiocache/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 7ca49b495f1c..b96d97ee409a 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , msgpack +, pythonOlder }: buildPythonPackage rec { pname = "aiocache"; version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; + rev = "refs/tags/v${version}"; + hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; propagatedBuildInputs = [ @@ -23,11 +27,15 @@ buildPythonPackage rec { # aiomcache would be required but last release was in 2017 doCheck = false; - pythonImportsCheck = [ "aiocache" ]; + + pythonImportsCheck = [ + "aiocache" + ]; meta = with lib; { description = "Python API Rate Limit Decorator"; - homepage = "https://github.com/tomasbasham/ratelimit"; + homepage = "https://github.com/aio-libs/aiocache"; + changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; From caf3e38874e328c43d7eac59f51a09795c7b932e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:12:59 +0100 Subject: [PATCH 3/5] python311Packages.aiocache: add optional-dependencies --- pkgs/development/python-modules/aiocache/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index b96d97ee409a..cca2c68c52fa 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -20,10 +20,14 @@ buildPythonPackage rec { hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; - propagatedBuildInputs = [ - aioredis - msgpack - ]; + passthru.optional-dependencies = { + redis = [ + redis + ]; + msgpack = [ + msgpack + ]; + }; # aiomcache would be required but last release was in 2017 doCheck = false; From f82355f05053a0c3087beb01478e19f19a511088 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:16:11 +0100 Subject: [PATCH 4/5] python311Packages.aiocache: fix module name --- pkgs/development/python-modules/aiocache/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index cca2c68c52fa..105ebc9188ea 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { redis = [ - redis + aioredis ]; msgpack = [ msgpack From 21b68892429601e69240952e70f542a9b7ddd142 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 11 Feb 2023 08:07:21 -0300 Subject: [PATCH 5/5] python311Packages.pyflunearyou: fix build --- .../python-modules/pyflunearyou/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index ea59fa0dc10f..cd04d00ee32e 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -9,6 +9,7 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , msgpack , ujson }: @@ -27,13 +28,14 @@ buildPythonPackage rec { sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' - ''; + pythonRelaxDeps = [ + "aiocache" + "ujson" + ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [