diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index e7c548c67d08..fef781e1c0c6 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { aiofiles aiohttp aiohttp-cors - async_generator + async-generator distro importlib-resources jinja2 diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index bfe6bc06199b..e2e2ebac9ae5 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -21,7 +21,7 @@ , typing-extensions , idna-ssl # tests_require -, async_generator +, async-generator , freezegun , gunicorn , pytest-mock @@ -80,7 +80,7 @@ buildPythonPackage rec { # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. nativeCheckInputs = [ - async_generator + async-generator freezegun gunicorn pytest-mock diff --git a/pkgs/development/python-modules/asks/default.nix b/pkgs/development/python-modules/asks/default.nix index 088e946c93d1..8be9a9b21160 100644 --- a/pkgs/development/python-modules/asks/default.nix +++ b/pkgs/development/python-modules/asks/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchFromGitHub , anyio -, async_generator +, async-generator , h11 , curio , overly @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ anyio - async_generator + async-generator h11 ]; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async-generator/default.nix similarity index 88% rename from pkgs/development/python-modules/async_generator/default.nix rename to pkgs/development/python-modules/async-generator/default.nix index e80fd914c19c..17014a410d4c 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async-generator/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "async_generator"; inherit version; - sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; + hash = "sha256-brs9EGwSkgqq5CzLb3h+9e79zdFm6j1ij6hHar5xIUQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index ca50920b188e..1ca084d999cd 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,5 +1,5 @@ { lib -, async_generator +, async-generator , buildPythonPackage , docutils , fetchFromGitHub @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - async_generator + async-generator docutils pytestCheckHook pytz diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 9dea973b042f..b1bb40ad70f7 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -5,7 +5,7 @@ , fetchPypi , fetchzip , alembic -, async_generator +, async-generator , certipy , python-dateutil , entrypoints @@ -113,7 +113,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt alembic - async_generator + async-generator certipy python-dateutil entrypoints diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 6f0d85ff9203..6c386ee01854 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,4 +1,4 @@ -{ async_generator +{ async-generator , buildPythonPackage , fetchFromGitHub , hatchling @@ -36,7 +36,7 @@ let nbclient = buildPythonPackage rec { ]; propagatedBuildInputs = [ - async_generator + async-generator traitlets nbformat nest-asyncio diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 22c044e68b81..1747fc677398 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,7 +1,7 @@ { lib , aiofiles , aiohttp -, async_generator +, async-generator , buildPythonPackage , fetchFromGitHub , pypubsub @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - async_generator + async-generator pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index e65e494a5409..36f31a0288c8 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, trio, async_generator, hypothesis, outcome, pytest }: +, trio, async-generator, hypothesis, outcome, pytest }: buildPythonPackage rec { pname = "pytest-trio"; @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ trio - async_generator + async-generator outcome ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 194dc3f71856..fb985e890a77 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , attrs , sortedcontainers -, async_generator +, async-generator , exceptiongroup , idna , outcome @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs sortedcontainers - async_generator + async-generator idna outcome sniffio diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5759fc0ba120..9a2fc3586909 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -45,6 +45,7 @@ mapAliases ({ apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05 argon2_cffi = argon2-cffi; # added 2022-05-09 APScheduler = apscheduler; # added 2023-02-19 + async_generator = async-generator; # added 2023-08-08 async_stagger = async-stagger; # added 2023-08-08 asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4757bf750eb..e61c411a31e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -736,10 +736,10 @@ self: super: with self; { asyauth = callPackage ../development/python-modules/asyauth { }; - async_generator = callPackage ../development/python-modules/async_generator { }; - async-dns = callPackage ../development/python-modules/async-dns { }; + async-generator = callPackage ../development/python-modules/async-generator { }; + async-interrupt = callPackage ../development/python-modules/async-interrupt { }; async-lru = callPackage ../development/python-modules/async-lru { };