diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index 9ff8b61feed8..51b923c86df6 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohappyeyeballs"; - version = "2.3.6"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohappyeyeballs"; rev = "refs/tags/v${version}"; - hash = "sha256-3cin755WD3e75l+mm//KG+g2UEkHvdYYEFvkJ9j9D6s="; + hash = "sha256-ZHxAup3Qf+ejW5Lz9ucuiWAQAwSG0Rf5giPSwk9A0ww="; }; outputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ poetry-core ] ++ optional-dependencies.docs; + build-system = [ poetry-core ] ++ optional-dependencies.docs; optional-dependencies = { docs = [ diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 576ea16a39f8..d0714071539a 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.10.5"; + version = "3.10.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-HN2TJ8hVbClakV3ldTOn3wbrhCuf2Qn9EjWCSlSyJpw="; + hash = "sha256-UOsWC5P/KT5YMzkAM6WuoOum30b8s4sgSUgR6EskHy0="; }; patches = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 62ccb7ef91d0..c0ea7712615d 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -8,6 +8,7 @@ ciso8601, cryptography, fetchFromGitHub, + fetchpatch2, pycognito, pyjwt, pytest-aiohttp, @@ -34,8 +35,15 @@ buildPythonPackage rec { hash = "sha256-/sY/JijBCcGcbMjoX0yuhFIWvU+TFVN8sRxBx+CDVVs="; }; - pythonRelaxDeps = [ "acme" ]; + patches = [ + (fetchpatch2 { + name = "aiohttp-3.10.6-compat.patch"; + url = "https://github.com/NabuCasa/hass-nabucasa/commit/b53bc12924ca6260583e250f49f663b2d1c11541.patch"; + hash = "sha256-Z5vTl0zuidFIo92Po8oLB0VfMC7c6mlq/mJkeHXOSpQ="; + }) + ]; + pythonRelaxDeps = [ "acme" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0fd0f0ae6898..356e3f792639 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,45 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, cython, expandvars, setuptools, idna, multidict, - typing-extensions, + pytest-cov-stub, pytest-xdist, pytestCheckHook, }: buildPythonPackage rec { pname = "yarl"; - version = "1.9.4"; + version = "1.13.1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Vm24ZxfPgIC5m1iwg7dzqQiuQPBmgeh+WJqXb6+CRr8="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "yarl"; + rev = "refs/tags/v${version}"; + hash = "sha256-I6/c5Q6/SRw8PIW4rPLKhVRVPRIC+n+Cz+UrKn5Pv/0="; }; - postPatch = '' - sed -i '/cov/d' pytest.ini - ''; - - nativeBuildInputs = [ + build-system = [ cython expandvars setuptools ]; - propagatedBuildInputs = [ + dependencies = [ idna multidict - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; preCheck = '' # don't import yarl from ./ so the C extension is available @@ -47,6 +45,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytest-cov-stub pytest-xdist pytestCheckHook ];