From 77aa81cbfda5dda3ba1d2bb49eb38e21a7e1b8df Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 28 Feb 2022 09:12:45 +0100 Subject: [PATCH 1/3] python3Packages.aioitertools: update and remove python 3.10 patch --- .../python-modules/aioitertools/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index cae0b10ea690..aa2987b1baf1 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -17,25 +17,16 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.8.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; + sha256 = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix TypeError: wait() got an unexpected keyword argument 'loop' - # See https://github.com/omnilib/aioitertools/issues/84 - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch"; - sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0="; - }) - ]; - nativeBuildInputs = [ flit-core ]; From 2f618b1abdf4693007c5910f3756b8c41c0aa26f Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 28 Feb 2022 11:04:16 +0100 Subject: [PATCH 2/3] correct typing_extensions error --- pkgs/development/python-modules/aioitertools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index aa2987b1baf1..289d1ae1630b 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; From f37471be4ce3d61a9dddd254aa2c868d03643956 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 14:47:57 +0100 Subject: [PATCH 3/3] python3Packages.aioitertools: update meta --- pkgs/development/python-modules/aioitertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 289d1ae1630b..451fb9e7fa10 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; license = licenses.mit; homepage = "https://pypi.org/project/aioitertools/"; maintainers = with maintainers; [ teh ];