From 574a680b7a490f8d2962d6d6453db0d945298671 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Dec 2023 23:59:36 +0100 Subject: [PATCH 01/53] python311Packages.aiocomelit: 0.6.0 -> 0.6.2 https://github.com/chemelli74/aiocomelit/blob/0.6.2/CHANGELOG.md --- pkgs/development/python-modules/aiocomelit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 82007382c23a..3be83f060564 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-bs+iSe4vu0ej4SQww6mvQqboVKfQrkd9OirBLGbU3gs="; + hash = "sha256-Pqds4RwDxaUyZUIGTK0JOjsKbyB7j3uOfunbLXsKANk="; }; postPatch = '' From 824208da7455e009a548ba745a1dc35a17206f56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Dec 2023 14:13:51 +0100 Subject: [PATCH 02/53] python311Packages.aioesphomeapi: 18.5.2 -> 19.2.1 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v18.5.2...v19.2.1 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v19.2.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index b22090a7593d..ae981e949dec 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.5.2"; + version = "19.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY="; + hash = "sha256-WSWGO0kI1m6oaImUYZ6m5WKJ+xPs/rtn5wVq1bDr+bE="; }; nativeBuildInputs = [ From 39850849689efd2676122ded0ba0c7a2ae67be2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Nov 2023 08:40:26 +0100 Subject: [PATCH 03/53] python311Packages.aiowithings: 1.0.3 -> 2.0.0 Diff: https://github.com/joostlek/python-withings/compare/refs/tags/v1.0.3...v2.0.0 Changelog: https://github.com/joostlek/python-withings/releases/tag/v2.0.0 --- pkgs/development/python-modules/aiowithings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 542511d2d3b1..64f7a23a17e4 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "1.0.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-n76bpFIWUfztTDEg32uopxukAtvFT3tdbtqWOLghi4I="; + hash = "sha256-wVLoM1Lq1fchyjOOmn+6wVzEAra8x2uK6qaiocVqzmw="; }; postPatch = '' From a49d07994f3841e4ac71d17fb331c208ccd27d6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Dec 2023 14:34:37 +0100 Subject: [PATCH 04/53] python311Packages.apple-weatherkit: 1.0.4 -> 1.1.1 Diff: https://github.com/tjhorner/python-weatherkit/compare/refs/tags/v1.0.4...v1.1.1 Changelog: https://github.com/tjhorner/python-weatherkit/releases/tag/v1.1.1 --- .../development/python-modules/apple-weatherkit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix index 89363e859bd0..f52b0fa5aea9 100644 --- a/pkgs/development/python-modules/apple-weatherkit/default.nix +++ b/pkgs/development/python-modules/apple-weatherkit/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , poetry-core , aiohttp +, aiohttp-retry , pythonOlder , pyjwt }: buildPythonPackage rec { pname = "apple-weatherkit"; - version = "1.0.4"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "tjhorner"; repo = "python-weatherkit"; rev = "refs/tags/v${version}"; - hash = "sha256-G/0hyK2rjdSSnVnvAUGyDvsfNMHVgAD7NHfNFmdBCNA="; + hash = "sha256-ZwHomiRkoV2Oi5c7qgTOKdu6R8dFfiVBi5XQMxrQvIU="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiohttp-retry pyjwt ] ++ pyjwt.optional-dependencies.crypto; From ca1c8cfe5c3271ee878e9dd25800c913f4c3158d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Dec 2023 23:59:55 +0100 Subject: [PATCH 05/53] python311Packages.bimmer-connected: 0.14.3 -> 0.14.6 https://github.com/bimmerconnected/bimmer_connected/releases/tag/0.14.6 --- .../python-modules/bimmer-connected/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index af622dfd7624..ade9544f32d0 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -11,14 +11,15 @@ , pytestCheckHook , python , respx +, setuptools , time-machine , tzdata }: buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.3"; - format = "setuptools"; + version = "0.14.6"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -26,22 +27,28 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-I/MKjdEu69uis5f/Xuk4H6ynC71IQmfASLr07PdEBXE="; + hash = "sha256-/FL9czp5x/BcKSXXzT19kgGiPFd61BpU7HLtgyyHlIs="; }; nativeBuildInputs = [ pbr + setuptools ]; PBR_VERSION = version; propagatedBuildInputs = [ httpx - pillow pycryptodome pyjwt ]; + passthru.optional-dependencies = { + china = [ + pillow + ]; + }; + postInstall = '' cp -R bimmer_connected/tests/responses $out/${python.sitePackages}/bimmer_connected/tests/ ''; @@ -51,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook respx time-machine - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); preCheck = '' export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo From 6e0059f67849664fc71e4cd91992546b052b30f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Dec 2023 00:00:35 +0100 Subject: [PATCH 06/53] python311Packages.elgato: 5.0.0 -> 5.1.1 https://github.com/frenck/python-elgato/releases/tag/v5.1.1 --- pkgs/development/python-modules/elgato/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 3aeab819b76a..01973168b881 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -3,8 +3,9 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "elgato"; - version = "5.0.0"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-elgato"; rev = "refs/tags/v${version}"; - hash = "sha256-TI5wu2FYVUMvgDkbktcwPLnTSD8XUSy8qwOCdrsiopk="; + hash = "sha256-g0po3BtY2uiOmuyWVA+o08c3I86SE4zmvo1ps8HpNNw="; }; postPatch = '' @@ -38,7 +39,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + mashumaro + orjson yarl ]; From 790473b7727adb2d7b2e1f34e4d1c5ca95fc8abc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Nov 2023 21:43:52 +0100 Subject: [PATCH 07/53] python311Packages.unicode-rbnf: init at 1.0.0 A pure Python implementation of ICU's rule-based number format engine. --- .../python-modules/unicode-rbnf/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/unicode-rbnf/default.nix diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix new file mode 100644 index 000000000000..934f51c67ddf --- /dev/null +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "unicode-rbnf"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "unicode-rbnf"; + rev = "v${version}"; + hash = "sha256-xwnfqWwQJKCJ4G+8eVaySTJAHxhwKYAqLHaCsxtBIl0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "unicode_rbnf" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/rhasspy/unicode-rbnf/v${version}/master/CHANGELOG.md"; + description = "A pure Python implementation of ICU's rule-based number format engine"; + homepage = "https://github.com/rhasspy/unicode-rbnf"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 075586b9db5c..4ac9086431d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15451,6 +15451,8 @@ self: super: with self; { unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + unicode-rbnf = callPackage ../development/python-modules/unicode-rbnf { }; + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; unicorn = callPackage ../development/python-modules/unicorn { From 9c6459db3739bd781b0a29d3526127d97e2f0324 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Nov 2023 21:46:00 +0100 Subject: [PATCH 08/53] python311Packages.hassil: 1.2.5 -> 1.5.1 https://github.com/home-assistant/hassil/blob/v1.5.1/CHANGELOG.md --- pkgs/development/python-modules/hassil/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 6059ce3cb5e6..65b97fd7c485 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -4,8 +4,8 @@ , pythonOlder # propagates -, importlib-resources , pyyaml +, unicode-rbnf # tests , pytestCheckHook @@ -13,21 +13,22 @@ let pname = "hassil"; - version = "1.2.5"; + version = "1.5.1"; in buildPythonPackage { inherit pname version; format = "setuptools"; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; - hash = "sha256-udOkZILoba2+eR8oSFThsB846COaIXawwRYhn261mCA="; + hash = "sha256-GLvDT8BUBvEzgiqKaXokF912g3fOH+KsXnmeOXIwe9U="; }; propagatedBuildInputs = [ pyyaml - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources + unicode-rbnf ]; nativeCheckInputs = [ @@ -35,7 +36,7 @@ buildPythonPackage { ]; meta = with lib; { - changelog = "https://github.com/home-assistant/hassil/releases/tag/v${version}"; + changelog = "https://github.com/home-assistant/hassil/blob/v${version}/CHANGELOG.md"; description = "Intent parsing for Home Assistant"; homepage = "https://github.com/home-assistant/hassil"; license = licenses.asl20; From 31839b44dab490b49dd5337d476aeb3a7b8799dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 21:48:20 +0100 Subject: [PATCH 09/53] home-assistant.intents: 2023.10.16 -> 2023.12.05 https://github.com/home-assistant/intents-package/compare/refs/tags/2023.10.16...2023.12.05 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 26fe812366d3..e88520bb883b 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.10.16"; + version = "2023.12.05"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE="; + hash = "sha256-BVcvlmX5+w7b9uNHA4ZP6Ebj+7ROUgEaAmXAGQrby+s="; fetchSubmodules = true; }; From a28caa5d756018163683104242eecc9c5109598c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 21:53:57 +0100 Subject: [PATCH 10/53] python311Packages.open-meteo: 0.2.1 -> 0.3.1 https://github.com/frenck/python-open-meteo/releases/tag/v0.3.0 https://github.com/frenck/python-open-meteo/releases/tag/v0.3.1 --- .../python-modules/open-meteo/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 4aec00f312b2..6da363372369 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -3,8 +3,9 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,46 +13,47 @@ buildPythonPackage rec { pname = "open-meteo"; - version = "0.2.1"; + version = "0.3.1"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-open-meteo"; rev = "v${version}"; - sha256 = "0i8jmhd29vvkpfxs9l5wy8525ngs79mnc7si2j9b1nc41xrv91f6"; + hash = "sha256-IB+dfQ4bb4dMYYQUVH9YbP3arvfgt4SooPlOKP3AVI8="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - aresponses - pydantic + mashumaro + orjson ]; nativeCheckInputs = [ + aresponses pytest-asyncio pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" \ - --replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"' - ''; - pythonImportsCheck = [ "open_meteo" ]; meta = with lib; { + changelog = "https://github.com/frenck/python-open-meteo/releases/tag/v${version}"; description = "Python client for the Open-Meteo API"; homepage = "https://github.com/frenck/python-open-meteo"; license = licenses.mit; From 3036b96a4b5eb2a4ecf39991a70296b9c985ac74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Nov 2023 23:42:04 +0100 Subject: [PATCH 11/53] python311Packages.pvo: 2.0.0 -> 2.1.1 Diff: https://github.com/frenck/python-pvoutput/compare/refs/tags/v2.0.0...v2.1.1 Changelog: - https://github.com/frenck/python-pvoutput/releases/tag/v2.1.0 - https://github.com/frenck/python-pvoutput/releases/tag/v2.1.1 --- pkgs/development/python-modules/pvo/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index 6963d3700013..d886bbd30ac9 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -4,16 +4,17 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pydantic +, mashumaro , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "pvo"; - version = "2.0.0"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-pvoutput"; rev = "refs/tags/v${version}"; - hash = "sha256-SvsrvGwIAlj/8hdk90+rxigVrx6n3YInvF/4eux2H04="; + hash = "sha256-Js8oPEMxJyWK1E6GDm1xwm2BilnV3WBM6Hibf6oFOKE="; }; postPatch = '' @@ -38,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + mashumaro yarl ]; @@ -46,6 +47,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ From a84652ea571982ba7fd0ef7e24e63e1ca1f2bd99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Nov 2023 08:45:25 +0100 Subject: [PATCH 12/53] python311Packages.pycfdns: 2.0.1 -> 3.0.0 Diff: https://github.com/ludeeus/pycfdns/compare/refs/tags/2.0.1...3.0.0 Changelog: https://github.com/ludeeus/pycfdns/releases/tag/3.0.0 --- .../python-modules/pycfdns/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix index e1af0553f5d0..339ade0ca71f 100644 --- a/pkgs/development/python-modules/pycfdns/default.nix +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -1,30 +1,36 @@ { lib , aiohttp -, async-timeout , buildPythonPackage , fetchFromGitHub +, poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "pycfdns"; - version = "2.0.1"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f6kxYX/dg16OWYpw29dH4Z26ncLZCYyHKGc4fzoCld0="; + hash = "sha256-bLzDakxKq8fcjEKSxc6D5VN9gfAu1M3/zaAU2UYnwSs="; }; postPatch = '' - substituteInPlace setup.py \ - --replace 'version="master",' 'version="${version}",' + substituteInPlace pyproject.toml \ + --replace 'version="0",' 'version="${version}",' ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp - async-timeout ]; # Project has no tests From 8c0cbe163fa10e6bfbfd97cb95f4afcdf0b78fb0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 22:05:27 +0100 Subject: [PATCH 13/53] python311Packages.pykoplenti: 1.0.0 -> 1.2.2 https://github.com/stegm/pykoplenti/compare/refs/tags/v1.0.0...v1.2.2 --- .../python-modules/pykoplenti/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 474b526abdd5..99f90e17b028 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , prompt-toolkit , pycryptodome +, pydantic , pythonOlder , setuptools }: buildPythonPackage rec { pname = "pykoplenti"; - version = "1.0.0"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "stegm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XBOKf3i8xywU/1Kzl+VI1Qnkp9ohpSuDX3AnotD32oo="; + hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E="; }; nativeBuildInputs = [ @@ -35,11 +36,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - click - prompt-toolkit pycryptodome + pydantic ]; + passthru.optional-dependencies = { + CLI = [ + click + prompt-toolkit + ]; + }; + # Project has no tests doCheck = false; From 5ffba0318dbd9ac7543d70d64fa01d09bdd06e25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 22:10:51 +0100 Subject: [PATCH 14/53] python311Packages.python-homewizard-energy: 2.1.2 -> 4.1.1 https://github.com/homewizard/python-homewizard-energy/releases/tag/v3.0.0 https://github.com/homewizard/python-homewizard-energy/releases/tag/v3.1.0 https://github.com/homewizard/python-homewizard-energy/releases/tag/v4.0.0 https://github.com/homewizard/python-homewizard-energy/releases/tag/v4.1.0 https://github.com/homewizard/python-homewizard-energy/releases/tag/v4.1.1 --- .../python-homewizard-energy/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index e7c0a2a26305..ca6c2770db46 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -1,37 +1,42 @@ { lib , aiohttp , aresponses -, awesomeversion +, async-timeout , buildPythonPackage , fetchFromGitHub , poetry-core -, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy }: buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "2.1.2"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "DCSBL"; - repo = pname; + repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-iyDRhTV5GSBTVK7ccJhUOrCpE9YuiI1vJM4XroCyIwE="; + hash = "sha256-p7uwodjC+wTGrlKf4i4ZRTPg9Qh9krsmwPpWNdF6J4U="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - awesomeversion aiohttp + async-timeout ]; __darwinAllowLocalNetworking = true; @@ -40,6 +45,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ @@ -48,8 +54,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with HomeWizard Energy devices"; - homepage = "https://github.com/DCSBL/python-homewizard-energy"; - changelog = "https://github.com/DCSBL/python-homewizard-energy/releases/tag/v${version}"; + homepage = "https://github.com/homewizard/python-homewizard-energy"; + changelog = "https://github.com/homewizard/python-homewizard-energy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 774442f610d7a63c4dca8e8c4a5f3ae624175946 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 22:29:57 +0100 Subject: [PATCH 15/53] python311Packages.python-matter-server: 4.0.2 -> 5.0.1 https://github.com/home-assistant-libs/python-matter-server/releases/tag/5.0.1 https://github.com/home-assistant-libs/python-matter-server/releases/tag/5.0.2 https://github.com/home-assistant-libs/python-matter-server/releases/tag/5.0.3 --- .../python-modules/python-matter-server/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 36e6ca30fcbd..7d8b5cd3dd15 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -5,11 +5,11 @@ # build , setuptools -, wheel # propagates , aiohttp , aiorun +, async-timeout , coloredlogs , dacite , orjson @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "4.0.2"; + version = "5.0.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -37,17 +37,22 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-fyVvmYznYuhDhU3kApXgXjkPdwhJFxoFq3U87ichmt8="; + hash = "sha256-bR6AVoy9f02RKZ57dnHTDAv5LTCcd/qBbzMDRKsGbfM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ aiohttp aiorun + async-timeout coloredlogs dacite orjson From 1a7f95b8e8eeb24a7f2c99cb94ad881ab67b7a06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Nov 2023 11:21:43 +0000 Subject: [PATCH 16/53] python310Packages.python-roborock: 0.35.3 -> 0.36.2 https://github.com/humbertogontijo/python-roborock/blob/v0.36.2/CHANGELOG.md --- .../python-modules/python-roborock/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 3fa39b27fba5..4df822ea6f22 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , aiohttp -, alexapy , async-timeout , buildPythonPackage , click @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.35.3"; + version = "0.36.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,12 +28,12 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-3XTVHs+mLePudLnr+bAN4pHvHtUcE0D5Hw+50Vxhlzw="; + hash = "sha256-FyoYAXWdNANxZJ9EKyfRrywKPJmSyt8QRPBlrk9jRIw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry-core==1.6.1" "poetry-core" + --replace "poetry-core==1.7.0" "poetry-core" ''; pythonRelaxDeps = [ @@ -47,7 +46,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - alexapy aiohttp async-timeout click From 9e01de3b76a567bd21fc6856943e86c477d732ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 22:52:22 +0100 Subject: [PATCH 17/53] python311Packages.pytraccar: 1.0.0 -> 2.0.0 Diff: https://github.com/ludeeus/pytraccar/compare/1.0.0...2.0.0 --- pkgs/development/python-modules/pytraccar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index f854589103a1..3a31942cb0e8 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - hash = "sha256-ngyLe6sbTTQ7n4WdV06OlQnn/vqkD+JUruyMYS1Ym+Q="; + hash = "sha256-7QGgI+DDYbordBx4LbtCvPWyEh6ur2RrSKMuDlwRlTo="; }; nativeBuildInputs = [ From ba352f0b2df9edc3133807e4ddd954f0c1b63b5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 22:55:10 +0100 Subject: [PATCH 18/53] python311Packages.pytraccar: clean-up --- pkgs/development/python-modules/pytraccar/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index 3a31942cb0e8..e622eeba73f6 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -4,7 +4,6 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pydantic , pytestCheckHook , pytest-asyncio , pythonOlder @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "pytraccar"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; - rev = version; + repo = "pytraccar"; + rev = "refs/tags/${version}"; hash = "sha256-7QGgI+DDYbordBx4LbtCvPWyEh6ur2RrSKMuDlwRlTo="; }; @@ -30,7 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic ]; nativeCheckInputs = [ @@ -56,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to handle device information from Traccar"; homepage = "https://github.com/ludeeus/pytraccar"; + changelog = "https://github.com/ludeeus/pytraccar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 1c9eab8fe140f0ea0b03862210f0b8d72c8fc1d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Nov 2023 09:04:35 +0100 Subject: [PATCH 19/53] python311Packages.pytrafikverket: 0.3.8 -> 0.3.9.1 Changelog: - https://github.com/endor-force/pytrafikverket/releases/tag/0.3.9 - https://github.com/endor-force/pytrafikverket/releases/tag/0.3.9.1 --- .../python-modules/pytrafikverket/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index 20b08ebd4431..c1c195fd5013 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -2,26 +2,29 @@ , buildPythonPackage , fetchPypi , aiohttp -, async-timeout , lxml , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.8"; - format = "setuptools"; + version = "0.3.9.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3p2tKFuzgl+VFRRXV66MRgcL1XS8xxDqMOUZw+Ql/5E="; + hash = "sha256-F0BMpZVzSK0i+tdvN//KZQqgxFrfLf0SCNztKCs6BYQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp - async-timeout lxml ]; From 8780a38bcf742aa49833034b5e360fe96c4075d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Nov 2023 17:24:25 +0100 Subject: [PATCH 20/53] python311Packages.restrictedpython: 6.2 -> 7.0 Changelog: https://github.com/zopefoundation/RestrictedPython/blob/7.0/CHANGES.rst Fixes: CVE-2023-37271, CVE-2023-41039 --- .../python-modules/restrictedpython/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 875771d8f8c6..169e28773b42 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -5,21 +5,26 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "restrictedpython"; - version = "6.2"; - format = "setuptools"; + version = "7.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-23Prfjs5ZQ8NIdEMyN2pwOKYbmIclLDF3jL7De46CK8="; + hash = "sha256-U3BK+7w1D9yPskVEE2e+Zxyfg4CGkgGy6EUudPzj2xQ="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock From aca231d8d15bb4061cc7b174854196953a6cf05c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 22:53:34 +0100 Subject: [PATCH 21/53] python311Packages.vallox-websocket-api: 3.3.0 -> 4.0.2 https://github.com/yozik04/vallox_websocket_api/releases/tag/4.0 https://github.com/yozik04/vallox_websocket_api/releases/tag/4.0.2 --- .../python-modules/vallox-websocket-api/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 48fae161b20c..21e99902929f 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.3.0"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-wlkb6aa2UtqjrbNA26TUH+ZKvOM64An+lol+MCdQh3U="; + hash = "sha256-a9cYYRAKX9sY9fQhefLWgyvk0vQl7Ao3zvw0SAtFW/Q="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp construct websockets ]; @@ -40,6 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "vallox_websocket_api" ]; meta = { + changelog = "https://github.com/yozik04/vallox_websocket_api/releases/tag/${version}"; description = "Async API for Vallox ventilation units"; homepage = "https://github.com/yozik04/vallox_websocket_api"; license = lib.licenses.lgpl3Only; From 3a8470fcf0b200378c05cd52afcad70434e65058 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 22:57:11 +0100 Subject: [PATCH 22/53] python311Packages.vehicle: 2.0.0 -> 2.2.1 https://github.com/frenck/python-vehicle/releases/tag/v2.1.0 https://github.com/frenck/python-vehicle/releases/tag/v2.2.0 https://github.com/frenck/python-vehicle/releases/tag/v2.2.1 --- .../python-modules/vehicle/default.nix | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index a233b51773ac..f09e88842bee 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -3,17 +3,19 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "vehicle"; - version = "2.0.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,25 +24,9 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "refs/tags/v${version}"; - hash = "sha256-EbjrAfbqVY336RHBWq81KM+oHixen+38aUTnWZQ+nCs="; + hash = "sha256-mu30v4iZoOYfQZc1P45UZaor6hf+i+gOvGcVGcQYzTo="; }; - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - pydantic - yarl - ]; - - nativeCheckInputs = [ - aresponses - pytest-asyncio - pytestCheckHook - ]; - postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ @@ -48,6 +34,24 @@ buildPythonPackage rec { --replace "--cov" "" ''; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + pythonImportsCheck = [ "vehicle" ]; From bbd59578028582f5233141856da16a098a097db8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 23:02:22 +0100 Subject: [PATCH 23/53] python311Packages.wyoming: 1.2.0 -> 1.3.0 https://github.com/rhasspy/wyoming/releases/tag/1.3.0 --- .../python-modules/wyoming/default.nix | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index b7ae51379cdc..6ea7e190d03f 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -1,6 +1,12 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub + +# build-system +, setuptools + +# optional-dependencies +, zeroconf # tests , wyoming-faster-whisper @@ -10,12 +16,24 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-mgNhc8PMRrwfvGZEcgIvQ/P2dysdDo2juvZccvb2C/g="; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming"; + rev = "refs/tags/${version}"; + hash = "sha256-UoXB+r72O9RaBvtXCEC1TAjjovYEYLqvv07GuQh0iCE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + passthru.optional-dependencies = { + zeroconf = [ + zeroconf + ]; }; pythonImportsCheck = [ @@ -34,8 +52,9 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/rhasspy/wyoming/releases/tag/${version}"; description = "Protocol for Rhasspy Voice Assistant"; - homepage = "https://pypi.org/project/wyoming/"; + homepage = "https://github.com/rhasspy/wyoming"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From 067013dfd7ce25be4ffa591970811ac6a19a7d9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 3 Dec 2023 00:03:32 +0100 Subject: [PATCH 24/53] python311Packages.zeroconf: 0.119.0 -> 0.128.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.120.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.121.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.122.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.122.1 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.122.2 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.122.3 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.123.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.124.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.125.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.126.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.127.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.128.0 --- .../python-modules/zeroconf/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 7c2cf10e5daf..5f6b412f4e87 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,6 +1,5 @@ { lib -, stdenv -, cython +, cython_3 , async-timeout , buildPythonPackage , fetchFromGitHub @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.119.0"; + version = "0.128.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,11 +23,16 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-VaqKk2WrRLZM2tfx3+y9GngEc6rMcw0b12ExFVfDYf4="; + hash = "sha256-44Ibjbimpl+KSnQ2QMwVg79F38gdWPYTR/ZRyW7JHEU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "Cython>=3.0.5" "Cython" + ''; + nativeBuildInputs = [ - cython + cython_3 poetry-core setuptools ]; From dc1c0ae268d7614fffa5efb46fec5c5a214b220b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Nov 2023 15:37:01 +0100 Subject: [PATCH 25/53] python311Packages.zigpy: 0.58.1 -> 0.60.0 https://github.com/zigpy/zigpy/releases/tag/0.60.0 --- pkgs/development/python-modules/zigpy/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 1f6560377ea7..80934e280d40 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -14,12 +14,11 @@ , pythonOlder , setuptools , voluptuous -, wheel }: buildPythonPackage rec { pname = "zigpy"; - version = "0.58.1"; + version = "0.60.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-i2P9QyhT/UQ8Xu0IfQ2OzAxIiMF4H04Jkz3/6e2FCpY="; + hash = "sha256-1i92YyOIoWSMDHgfnXiXQuvDnmEPlSHwoSLmmsoTkDU="; }; postPatch = '' @@ -39,7 +38,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ From 8848f2679343abd7ee34b7c487facd050334d0fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Nov 2023 15:49:36 +0100 Subject: [PATCH 26/53] python311Packages.zigpy-xbee: 0.19.0 -> 0.20.0 https://github.com/zigpy/zigpy-xbee/releases/tag/0.20.0 --- .../python-modules/zigpy-xbee/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index d07eebad4d50..d40e2b17b6cc 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -6,26 +6,35 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.19.0"; - format = "setuptools"; - # https://github.com/Martiusweb/asynctest/issues/152 - # broken by upstream python bug with asynctest and - # is used exclusively by home-assistant with python 3.8 + version = "0.20.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-KUXXOySuPFNKcW3O08FBYIfm4WwVjOuIF+GefmKnwl0="; + hash = "sha256-Ja9U/X9YblS6uUD7MX3t2tItG9AMiNF7OFgvIotdvQs="; }; - buildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy From 1865c015ed801652b91eb00c338b380eb5b5ef4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Nov 2023 15:54:49 +0100 Subject: [PATCH 27/53] python311Packages.zigpy-zigate: 0.11.0 -> 0.12.0 https://github.com/zigpy/zigpy-zigate/releases/tag/0.12.0 --- .../python-modules/zigpy-zigate/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 4b11d35b6b7d..0c11c6ed5c3d 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -9,13 +9,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.11.0"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,9 +24,19 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-eGN2QvPHZ8gfPPFdUbAP9cs43jzUHDBS/w1tni1shB0="; + hash = "sha256-wziXUFYSUXhzWHM870jphG12h99WVzqiYimtIbkXyM0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ gpiozero pyserial From 9f757e54e527e5c7f2105e7893324f6fcc4fb3df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Nov 2023 15:55:29 +0100 Subject: [PATCH 28/53] python311Packages.zigpy-deconz: 0.21.1 -> 0.22.0 https://github.com/zigpy/zigpy-deconz/releases/tag/0.22.0 --- .../python-modules/zigpy-deconz/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index a0bc46b09a02..b5ed6bbd11d0 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -6,13 +6,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.21.1"; - format = "setuptools"; + version = "0.22.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +21,19 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YRJMIpC6Zk5sQjGyzdEbQEeYgFJzIbxe4BReayceu10="; + hash = "sha256-pdWWI+yZh0uf2TzVbyJFIrxM2zfmaPG/PGZWaNNrZ6M="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyserial pyserial-asyncio From 6a92196ceff8caf017b9b0a2ab3ea33dc982f096 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Nov 2023 15:55:35 +0100 Subject: [PATCH 29/53] python311Packages.zigpy-znp: 0.11.6 -> 0.12.0 https://github.com/zigpy/zigpy-znp/releases/tag/v0.12.0 --- .../python-modules/zigpy-znp/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index cf487cae0894..5d1bc6d70bf5 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -10,14 +10,15 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , voluptuous , zigpy }: buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.6"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +26,18 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K85AmksP/dXKL4DQKadyvjK7y5x6yEgc6vDJAPfblTw="; + hash = "sha256-nPk//1MMvtWf2iLZZ/2vJoBdFEJBmy8RBMwSFzfnNT8="; }; + nativeBuildInputs = [ + setuptools + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace "timeout = 20" "timeout = 300" + --replace "timeout = 20" "timeout = 300" \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; propagatedBuildInputs = [ From 7337634c1f0d22f5de38983bddf0b09ab7413f92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Nov 2023 12:46:57 +0100 Subject: [PATCH 30/53] python311Packages.zha-quirks: 0.0.106 -> 0.0.107 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.107 --- .../python-modules/zha-quirks/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index a8959a9e863b..b6100a169117 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -2,26 +2,47 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.106"; - format = "setuptools"; + version = "0.0.107"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-+sL3AbjDg0Kl6eqMwVAN9W85QKJqFR1ANKz1E958KeA="; + hash = "sha256-JHf6PZDK7yjyHjjUhkNpqEINCaY916wX5rXaw1Fx1ro="; }; + patches = [ + (fetchpatch { + # https://github.com/zigpy/zha-device-handlers/pull/2787 + name = "zigpy-0.60-compat.patch"; + url = "https://github.com/zigpy/zha-device-handlers/commit/f497ccd2437ae9a24b9afdb84f11fc27a30df211.patch"; + hash = "sha256-ICatiA0QRmfJ4Vf4LWyUJI5TLeWoikII49HSBir5WNI="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp zigpy From c53f1ab3147020d60cf747cc62d168f41027543b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Nov 2023 12:48:08 +0100 Subject: [PATCH 31/53] python311Packages.bellows: 0.36.8 -> 0.37.1 https://github.com/zigpy/bellows/releases/tag/0.37.1 --- .../python-modules/bellows/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 846b58a677b8..03ebff7aea5f 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -9,14 +9,15 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , voluptuous , zigpy }: buildPythonPackage rec { pname = "bellows"; - version = "0.36.8"; - format = "setuptools"; + version = "0.37.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,9 +25,19 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-+p3As+fi6mw9i5q2klFTM9QQ2JoQarwrphc6tB6C94M="; + hash = "sha256-JkaCM9XOdGZE9/C2BUV3g9QL5+k/HlVYd4WsAMS2mgk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ click click-log From a32700ea6769eb0e3d1d250d0f4484bbc44df361 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Nov 2023 10:59:27 +0100 Subject: [PATCH 32/53] python311Packages.universal-silabs-flasher: 0.0.14 -> 0.0.15 https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.15 --- .../python-modules/universal-silabs-flasher/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 420b9f078c15..3872cd5ce2a5 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -6,7 +6,6 @@ # build-system , setuptools , setuptools-git-versioning -, wheel # dependencies , async-timeout @@ -27,20 +26,19 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.14"; - format = "pyproject"; + version = "0.0.15"; + pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "v${version}"; - hash = "sha256-0c9b571gJXFOAe5ct8O/qy7D6rDosmBHDYEv6odLQ2s="; + hash = "sha256-5hA1i2XzKzQDRrZfOaA6I3X7hU+nSd7HpcHHNIzZO7g="; }; nativeBuildInputs = [ setuptools setuptools-git-versioning - wheel ]; propagatedBuildInputs = [ @@ -65,6 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "universal_silabs_flasher" ]; meta = with lib; { + changelog = "https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v${version}"; description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; license = licenses.gpl3Only; From a8117ff232ca9ffc4d511e181dc6e4e8dfa9f2cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Nov 2023 21:37:56 +0100 Subject: [PATCH 33/53] python311Packages.zlib-ng: init at 0.2.0 --- .../python-modules/zlib-ng/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/zlib-ng/default.nix diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix new file mode 100644 index 000000000000..36a8f98c0fb0 --- /dev/null +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, cmake +, setuptools + +# native dependencies +, zlib-ng + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zlib-ng"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pycompression"; + repo = "python-zlib-ng"; + rev = "v${version}"; + hash = "sha256-dZnX94SOuV1/zTYUecnRe6DDKf5nAvydHn7gESVQ6hs="; + }; + + nativeBuildInputs = [ + cmake + setuptools + ]; + + dontUseCmakeConfigure = true; + + env.PYTHON_ZLIB_NG_LINK_DYNAMIC = true; + + buildInputs = [ + zlib-ng + ]; + + pythonImportsCheck = [ + "zlib_ng" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf src + ''; + + meta = with lib; { + description = "A drop-in replacement for Python's zlib and gzip modules using zlib-ng"; + homepage = "https://github.com/pycompression/python-zlib-ng"; + changelog = "https://github.com/pycompression/python-zlib-ng/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.psfl; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ac9086431d5..bc5c461f12db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16319,6 +16319,10 @@ self: super: with self; { zipstream-ng = callPackage ../development/python-modules/zipstream-ng { }; + zlib-ng = callPackage ../development/python-modules/zlib-ng { + inherit (pkgs) zlib-ng; + }; + zm-py = callPackage ../development/python-modules/zm-py { }; zodb = callPackage ../development/python-modules/zodb { }; From 4d9830835f568f380b0bbf336ed386bfcf9a849b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Nov 2023 21:39:54 +0100 Subject: [PATCH 34/53] python311Packages.aiohttp-zlib-ng: init at 0.1.1 Enable zlib_ng on aiohttp --- .../aiohttp-zlib-ng/default.nix | 39 +++++++++++++++++++ .../python-modules/zlib-ng/default.nix | 10 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/aiohttp-zlib-ng/default.nix diff --git a/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix new file mode 100644 index 000000000000..35be33c05482 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, aiohttp +, zlib-ng +}: + +buildPythonPackage rec { + pname = "aiohttp-zlib-ng"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-zlib-ng"; + rev = "v${version}"; + hash = "sha256-dTNwt4eX6ZQ8ySK2/9ziVbc3KFg2aL/EsiBWaJRC4x8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + zlib-ng + ]; + + pythonImportsCheck = [ "aiohttp_zlib_ng" ]; + + meta = with lib; { + description = "Enable zlib_ng on aiohttp"; + homepage = "https://github.com/bdraco/aiohttp-zlib-ng"; + changelog = "https://github.com/bdraco/aiohttp-zlib-ng/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 36a8f98c0fb0..397309d086ae 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -50,6 +50,16 @@ buildPythonPackage rec { rm -rf src ''; + disabledTests = [ + # commandline tests fail to find the built module + "test_compress_fast_best_are_exclusive" + "test_compress_infile_outfile" + "test_compress_infile_outfile_default" + "test_decompress_cannot_have_flags_compression" + "test_decompress_infile_outfile" + "test_decompress_infile_outfile_error" + ]; + meta = with lib; { description = "A drop-in replacement for Python's zlib and gzip modules using zlib-ng"; homepage = "https://github.com/pycompression/python-zlib-ng"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc5c461f12db..889c309ec216 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -250,6 +250,8 @@ self: super: with self; { aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { }; + aiohttp-zlib-ng = callPackage ../development/python-modules/aiohttp-zlib-ng { }; + aioitertools = callPackage ../development/python-modules/aioitertools { }; aiobiketrax = callPackage ../development/python-modules/aiobiketrax { }; From 91c079a995bf794bcfcfd2e732a7f24390bc4788 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 17:44:57 +0100 Subject: [PATCH 35/53] python311Packages.firebase-messaging: init at 0.2.0 Packaged as a dependency of ring-doorbell. --- .../firebase-messaging/default.nix | 84 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/firebase-messaging/default.nix diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix new file mode 100644 index 000000000000..bc5a4d1dbdf7 --- /dev/null +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, poetry-core + +# dependencies +, cryptography +, http-ece +, protobuf +, requests + +# docs +, sphinx +, sphinxHook +, sphinx-autodoc-typehints +, sphinx-rtd-theme + +# tests +, async-timeout +, requests-mock +, pytest-asyncio +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "firebase-messaging"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sdb9696"; + repo = "firebase-messaging"; + rev = version; + hash = "sha256-e3Ny3pnAfOpNERvvtE/jqSDIsM+YwLq/hbw753QpJ6o="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + poetry-core + sphinxHook + ] ++ passthru.optional-dependencies.docs; + + propagatedBuildInputs = [ + cryptography + http-ece + protobuf + requests + ]; + + passthru.optional-dependencies = { + docs = [ + sphinx + sphinx-autodoc-typehints + sphinx-rtd-theme + ]; + }; + + pythonImportsCheck = [ + "firebase_messaging" + ]; + + nativeCheckInputs = [ + async-timeout + requests-mock + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + meta = with lib; { + description = "A library to subscribe to GCM/FCM and receive notifications within a python application"; + homepage = "https://github.com/sdb9696/firebase-messaging"; + changelog = "https://github.com/sdb9696/firebase-messaging/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 889c309ec216..20bef22ff444 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3976,6 +3976,8 @@ self: super: with self; { fire = callPackage ../development/python-modules/fire { }; + firebase-messaging = callPackage ../development/python-modules/firebase-messaging { }; + fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { }; firetv = callPackage ../development/python-modules/firetv { }; From 66822de73c9224a3405ea11b17a39735445ac427 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 17:45:50 +0100 Subject: [PATCH 36/53] python311Packages.ring-doorbell: expose listen extra --- pkgs/development/python-modules/ring-doorbell/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index ac7d76f4377e..03681c20b148 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -2,6 +2,7 @@ , asyncclick , buildPythonPackage , fetchPypi +, firebase-messaging , oauthlib , poetry-core , pytest-asyncio @@ -40,6 +41,12 @@ buildPythonPackage rec { requests-oauthlib ]; + passthru.optional-dependencies = { + listen = [ + firebase-messaging + ]; + }; + nativeCheckInputs = [ pytest-asyncio pytest-mock From d62c539d868ea079d590ccabaa29f5c6f55edbe9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 23:46:21 +0100 Subject: [PATCH 37/53] home-assistant: 2023.11.3 -> 2023.12.0 https://www.home-assistant.io/blog/2023/12/06/release-202312/ --- .../home-assistant/component-packages.nix | 679 ++++++++++++++++-- pkgs/servers/home-assistant/default.nix | 47 +- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 625 insertions(+), 105 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9519d190b808..8fd46bf70e87 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.11.3"; + version = "2023.12.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -60,10 +60,11 @@ "airthings_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly airthings-ble - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -72,6 +73,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -110,6 +112,8 @@ ]; "alexa" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "alpha_vantage" = ps: with ps; [ @@ -123,6 +127,8 @@ ]; "ambiclimate" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ambiclimate ]; "ambient_station" = ps: with ps; [ @@ -139,6 +145,8 @@ ]; "analytics" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -175,9 +183,13 @@ ]; "api" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "apple_tv" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -187,6 +199,8 @@ ]; "application_credentials" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -206,10 +220,11 @@ "aranet" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly aranet4 - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -218,6 +233,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -242,6 +258,8 @@ ]; "arwn" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -250,6 +268,9 @@ ]; "assist_pipeline" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents mutagen @@ -263,6 +284,7 @@ ]; "asuswrt" = ps: with ps; [ aioasuswrt + pyasuswrt ]; "atag" = ps: with ps; [ pyatag @@ -292,9 +314,13 @@ ]; "auth" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "automation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "avea" = ps: with ps; [ avea @@ -310,6 +336,8 @@ ]; "axis" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng axis janus paho-mqtt @@ -325,6 +353,8 @@ ]; "backup" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant securetar @@ -377,9 +407,10 @@ "bluemaestro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluemaestro-ble @@ -389,6 +420,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -407,6 +439,8 @@ ]; "bluetooth" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bleak bleak-retry-connector bluetooth-adapters @@ -422,9 +456,10 @@ "bluetooth_adapters" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -433,6 +468,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -447,9 +483,10 @@ "bluetooth_le_tracker" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -458,6 +495,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -475,12 +513,15 @@ ]; "bmw_connected_drive" = ps: with ps; [ bimmer-connected - ]; + ] + ++ bimmer-connected.optional-dependencies.china; "bond" = ps: with ps; [ bond-async ]; "bosch_shc" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng boschshcpy fnv-hash-fast ifaddr @@ -522,9 +563,10 @@ "bthome" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -534,6 +576,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -559,9 +602,13 @@ ]; "calendar" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "camera" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "canary" = ps: with ps; [ @@ -570,7 +617,10 @@ ]; "cast" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents @@ -581,6 +631,7 @@ plexwebsocket psutil-home-assistant pychromecast + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -617,11 +668,18 @@ ]; "cloud" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ @@ -630,7 +688,7 @@ "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ - co2signal + aioelectricitymaps ]; "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase @@ -658,6 +716,8 @@ ]; "config" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "configurator" = ps: with ps; [ ]; @@ -666,6 +726,8 @@ ]; "conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -687,6 +749,8 @@ ]; "crownstone" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng crownstone-cloud crownstone-sse crownstone-uart @@ -732,6 +796,8 @@ "default_config" = ps: with ps; [ aiodiscover aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client bleak bleak-retry-connector @@ -741,6 +807,7 @@ dbus-fast fnv-hash-fast ha-av + ha-ffmpeg hass-nabucasa hassil home-assistant-frontend @@ -753,6 +820,7 @@ psutil-home-assistant pynacl pyserial + python-matter-server pyturbojpeg pyudev scapy @@ -771,6 +839,8 @@ ]; "demo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -781,16 +851,31 @@ ]; "derivative" = ps: with ps; [ ]; + "devialet" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + devialet + fnv-hash-fast + ifaddr + psutil-home-assistant + sqlalchemy + zeroconf + ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng devolo-home-control-api fnv-hash-fast ifaddr @@ -810,9 +895,13 @@ ]; "diagnostics" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "dialogflow" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "diaz" = ps: with ps; [ ]; @@ -843,6 +932,8 @@ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -853,6 +944,8 @@ ]; "dlna_dms" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -865,6 +958,8 @@ ]; "dominos" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow @@ -872,6 +967,8 @@ ]; "doorbird" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng doorbirdpy ]; "dooya" = ps: with ps; [ @@ -879,9 +976,10 @@ "dormakaba_dkey" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -890,6 +988,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -914,6 +1013,8 @@ ]; "dsmr_reader" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -936,6 +1037,8 @@ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng dynalite-devices fnv-hash-fast home-assistant-frontend @@ -973,6 +1076,8 @@ "ecowitt" = ps: with ps; [ aioecowitt aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "eddystone_temperature" = ps: with ps; [ ]; # missing inputs: beacontools @@ -994,6 +1099,8 @@ ]; # missing inputs: pyElectra "electric_kiwi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1006,6 +1113,8 @@ ]; "elkm1" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng elkm1-lib fnv-hash-fast ifaddr @@ -1030,6 +1139,8 @@ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -1040,6 +1151,8 @@ ]; "emulated_roku" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng emulated-roku fnv-hash-fast ifaddr @@ -1050,6 +1163,8 @@ ]; "energy" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1085,32 +1200,6 @@ ]; "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ - aioesphomeapi - aiohttp-cors - aioruuvigateway - aioshelly - async-interrupt - bleak - bleak-retry-connector - bluetooth-adapters - bluetooth-auto-recovery - bluetooth-data-tools - construct - dbus-fast - esphome-dashboard-api - fnv-hash-fast - hassil - home-assistant-intents - ifaddr - mutagen - psutil-home-assistant - pyserial - pyudev - sqlalchemy - webrtc-noise-gain - zeroconf - ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ pescea ]; @@ -1119,7 +1208,8 @@ "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors - async-interrupt + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bleak bleak-retry-connector bluetooth-adapters @@ -1128,6 +1218,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1147,9 +1238,10 @@ "eufylife_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1159,6 +1251,7 @@ esphome-dashboard-api eufylife-ble-client fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1226,6 +1319,8 @@ ]; "file_upload" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus ]; "filesize" = ps: with ps; [ @@ -1248,6 +1343,8 @@ ]; "fitbit" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fitbit fnv-hash-fast psutil-home-assistant @@ -1262,9 +1359,10 @@ "fjaraskupan" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1274,6 +1372,7 @@ esphome-dashboard-api fjaraskupan fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1314,6 +1413,8 @@ ]; "flux_led" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng flux-led fnv-hash-fast ifaddr @@ -1333,6 +1434,8 @@ ]; "forked_daapd" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -1346,6 +1449,8 @@ ]; "foursquare" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -1360,6 +1465,8 @@ ]; "fritz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast fritzconnection ifaddr @@ -1380,6 +1487,8 @@ ]; "frontend" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -1391,6 +1500,11 @@ afsapi ]; "fully_kiosk" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + janus + paho-mqtt python-fullykiosk ]; "futurenow" = ps: with ps; [ @@ -1404,9 +1518,10 @@ "gardena_bluetooth" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1415,6 +1530,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1435,6 +1551,8 @@ ]; "generic" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-av pillow ]; @@ -1458,6 +1576,8 @@ ]; "geocaching" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast geocachingapi psutil-home-assistant @@ -1465,6 +1585,8 @@ ]; "geofency" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes @@ -1497,6 +1619,8 @@ ]; "google" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gcal-sync oauth2client @@ -1505,10 +1629,18 @@ ]; "google_assistant" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gassist-text psutil-home-assistant @@ -1521,12 +1653,16 @@ ]; "google_generative_ai_conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng google-generativeai hassil home-assistant-intents ]; "google_mail" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1540,6 +1676,8 @@ ]; "google_sheets" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gspread psutil-home-assistant @@ -1547,6 +1685,8 @@ ]; "google_tasks" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1563,9 +1703,10 @@ "govee_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1575,6 +1716,7 @@ esphome-dashboard-api fnv-hash-fast govee-ble + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1591,11 +1733,15 @@ ]; "gpslogger" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast greeclimate ifaddr @@ -1625,6 +1771,8 @@ ]; "hardkernel" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1638,6 +1786,8 @@ ]; "hassio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "havana_shade" = ps: with ps; [ ]; @@ -1673,6 +1823,8 @@ ]; "history" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1692,6 +1844,8 @@ ]; "home_connect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast homeconnect psutil-home-assistant @@ -1699,6 +1853,8 @@ ]; "home_plus_control" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng homepluscontrol ]; "homeassistant" = ps: with ps; [ @@ -1707,6 +1863,8 @@ ]; "homeassistant_green" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1727,6 +1885,8 @@ ]; "homeassistant_hardware" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1747,6 +1907,8 @@ ]; "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1767,6 +1929,8 @@ ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1787,6 +1951,8 @@ ]; "homekit" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng base36 fnv-hash-fast ha-ffmpeg @@ -1802,9 +1968,10 @@ aioesphomeapi aiohomekit aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1813,6 +1980,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1848,10 +2016,14 @@ ]; "html5" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pywebpush ]; "http" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "huawei_lte" = ps: with ps; [ huawei-lte-api @@ -1893,9 +2065,10 @@ "ibeacon" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1904,6 +2077,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ibeacon-ble @@ -1922,9 +2096,10 @@ "idasen_desk" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1933,6 +2108,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1948,6 +2124,8 @@ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyfttt ]; "iglo" = ps: with ps; [ @@ -1960,25 +2138,34 @@ ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "image_processing" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "image_upload" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "imap" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioimaplib ]; "improv_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1987,6 +2174,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2008,9 +2196,10 @@ "inkbird" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2019,6 +2208,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2047,6 +2237,8 @@ ]; "insteon" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant @@ -2065,6 +2257,8 @@ ]; "intent" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "intent_script" = ps: with ps; [ ]; @@ -2073,6 +2267,8 @@ ]; "ios" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2148,9 +2344,10 @@ "kegtron" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2159,6 +2356,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2180,9 +2378,10 @@ "keymitt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2191,6 +2390,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2219,6 +2419,8 @@ ]; "knx" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2231,10 +2433,14 @@ ]; "kodi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng konnected ]; "kostal_plenticore" = ps: with ps; [ @@ -2257,6 +2463,8 @@ ]; # missing inputs: lacrosse-view "lametric" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng demetriek fnv-hash-fast psutil-home-assistant @@ -2264,6 +2472,8 @@ ]; "landisgyr_heat_meter" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -2290,9 +2500,10 @@ "ld2410_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2301,6 +2512,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2316,9 +2528,10 @@ "led_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2327,6 +2540,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2355,6 +2569,8 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiolifx aiolifx-effects aiolifx-themes @@ -2373,6 +2589,8 @@ "limitlessled" = ps: with ps; [ limitlessled ]; + "linear_garage_door" = ps: with ps; [ + ]; # missing inputs: linear-garage-door "linksys_smart" = ps: with ps; [ ]; "linode" = ps: with ps; [ @@ -2400,6 +2618,8 @@ ]; "local_ip" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2410,11 +2630,15 @@ ]; "locative" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2428,6 +2652,8 @@ ]; "logi_circle" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-ffmpeg logi-circle ]; @@ -2440,12 +2666,19 @@ ]; "loqed" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents loqedapi mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "lovelace" = ps: with ps; [ @@ -2471,6 +2704,8 @@ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiolyric fnv-hash-fast psutil-home-assistant @@ -2478,20 +2713,28 @@ ]; "mailbox" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "mailgun" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pymailgunner ]; "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "map" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2514,6 +2757,8 @@ ]; "matter" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant python-matter-server @@ -2530,9 +2775,10 @@ "medcom_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2541,6 +2787,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2554,13 +2801,19 @@ ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng yt-dlp ]; "media_player" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "media_source" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "mediaroom" = ps: with ps; [ pymediaroom @@ -2573,9 +2826,10 @@ "melnor" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2584,6 +2838,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2597,6 +2852,8 @@ ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "message_bird" = ps: with ps; [ messagebird @@ -2625,14 +2882,20 @@ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_detect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "mijndomein_energie" = ps: with ps; [ @@ -2657,9 +2920,10 @@ "moat" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2668,6 +2932,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2682,7 +2947,10 @@ ]; "mobile_app" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents @@ -2690,6 +2958,7 @@ pillow psutil-home-assistant pynacl + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -2701,6 +2970,8 @@ ]; "modem_callerid" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast phone-modem psutil-home-assistant @@ -2724,9 +2995,10 @@ "mopeka" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2735,6 +3007,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2749,6 +3022,8 @@ ]; "motion_blinds" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr motionblinds @@ -2757,6 +3032,8 @@ ]; "motioneye" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng motioneye-client ]; "mpd" = ps: with ps; [ @@ -2764,26 +3041,36 @@ ]; "mqtt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_json" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -2801,6 +3088,8 @@ ]; "my" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2809,16 +3098,19 @@ sqlalchemy ]; "myq" = ps: with ps; [ - python-myq ]; "mysensors" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ @@ -2838,6 +3130,8 @@ ]; "neato" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pybotvac @@ -2851,6 +3145,8 @@ ]; "nest" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-nest-sdm ha-ffmpeg @@ -2859,13 +3155,17 @@ ]; "netatmo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen psutil-home-assistant pyatmo + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -2881,9 +3181,13 @@ ]; "netio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2928,6 +3232,8 @@ ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast getmac ifaddr @@ -2966,6 +3272,8 @@ ]; "nuki" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pynuki ]; "numato" = ps: with ps; [ @@ -3008,6 +3316,8 @@ ]; "onboarding" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast pillow psutil-home-assistant @@ -3018,6 +3328,8 @@ ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ondilo ]; "onewire" = ps: with ps; [ @@ -3036,6 +3348,8 @@ ]; "openai_conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents openai @@ -3091,9 +3405,10 @@ "oralb" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3102,6 +3417,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3125,6 +3441,8 @@ ]; # missing inputs: lightify "otbr" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast ifaddr @@ -3150,6 +3468,8 @@ "otp" = ps: with ps; [ pyotp ]; + "ourgroceries" = ps: with ps; [ + ]; # missing inputs: ourgroceries "overkiz" = ps: with ps; [ pyoverkiz ]; @@ -3158,14 +3478,21 @@ ]; "owntracks" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents janus mutagen paho-mqtt + psutil-home-assistant pynacl + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ @@ -3182,6 +3509,8 @@ ]; "panel_custom" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -3191,6 +3520,8 @@ ]; "panel_iframe" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -3213,10 +3544,14 @@ ]; "pepco" = ps: with ps; [ ]; + "permobil" = ps: with ps; [ + ]; # missing inputs: mypermobil "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "pge" = ps: with ps; [ @@ -3245,12 +3580,19 @@ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pyplaato + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "plant" = ps: with ps; [ @@ -3260,6 +3602,8 @@ ]; "plex" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng plexapi plexauth plexwebsocket @@ -3274,6 +3618,8 @@ ]; "point" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pypoint ]; "poolsense" = ps: with ps; [ @@ -3287,9 +3633,10 @@ "private_ble_device" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3298,6 +3645,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3320,6 +3668,8 @@ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng prometheus-client ]; "prosegur" = ps: with ps; [ @@ -3353,6 +3703,8 @@ ]; "push" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "pushbullet" = ps: with ps; [ pushbullet-py @@ -3372,16 +3724,16 @@ ]; "python_script" = ps: with ps; [ restrictedpython - restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3390,6 +3742,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3428,12 +3781,19 @@ ]; "rachio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg rachiopy + sqlalchemy webrtc-noise-gain ]; "radarr" = ps: with ps; [ @@ -3463,9 +3823,10 @@ "rapt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3474,6 +3835,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3488,6 +3850,8 @@ ]; "raspberry_pi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3507,7 +3871,10 @@ ]; "recovery_mode" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-frontend @@ -3516,6 +3883,7 @@ mutagen pillow psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3544,10 +3912,14 @@ ]; "reolink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng reolink-aio ]; "repairs" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng @@ -3567,6 +3939,8 @@ ]; "rhasspy" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "ridwell" = ps: with ps; [ aioridwell @@ -3574,7 +3948,8 @@ "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell - ]; + ] + ++ ring-doorbell.optional-dependencies.listen; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ @@ -3588,7 +3963,7 @@ ]; "roborock" = ps: with ps; [ python-roborock - ]; + ]; # missing inputs: vacuum-map-parser-roborock "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ @@ -3613,11 +3988,15 @@ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg rtsp-to-webrtc ]; @@ -3630,6 +4009,8 @@ ]; # missing inputs: russound "ruuvi_gateway" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway bleak bleak-retry-connector @@ -3646,9 +4027,10 @@ "ruuvitag_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3657,6 +4039,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3679,6 +4062,8 @@ ]; "samsungtv" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -3721,6 +4106,8 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -3742,9 +4129,10 @@ "sensirion_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3753,6 +4141,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3775,9 +4164,10 @@ "sensorpro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3786,6 +4176,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3801,9 +4192,10 @@ "sensorpush" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3812,6 +4204,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3829,6 +4222,8 @@ ]; "senz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiosenz fnv-hash-fast psutil-home-assistant @@ -3858,6 +4253,8 @@ ]; "shelly" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioshelly bleak bleak-retry-connector @@ -3876,6 +4273,8 @@ ]; "shopping_list" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "sia" = ps: with ps; [ pysiaalarm @@ -3929,6 +4328,8 @@ ]; # missing inputs: goslide-api "slimproto" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioslimproto ]; "sma" = ps: with ps; [ @@ -3936,6 +4337,8 @@ ]; "smappee" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysmappee ]; "smart_blinds" = ps: with ps; [ @@ -3949,13 +4352,20 @@ ]; "smartthings" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pysmartapp pysmartthings + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "smarttub" = ps: with ps; [ @@ -3974,6 +4384,8 @@ ]; "snips" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -3983,9 +4395,10 @@ "snooz" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3994,6 +4407,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4034,6 +4448,8 @@ ]; "sonos" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4055,6 +4471,8 @@ ]; "spaceapi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "spc" = ps: with ps; [ pyspcwebgw @@ -4069,6 +4487,8 @@ ]; # missing inputs: hass-splunk "spotify" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -4085,6 +4505,8 @@ ]; "ssdp" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4115,6 +4537,8 @@ ]; "steamist" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiosteamist discovery30303 fnv-hash-fast @@ -4132,6 +4556,8 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-av numpy pyturbojpeg @@ -4141,6 +4567,8 @@ ]; "stt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "subaru" = ps: with ps; [ subarulink @@ -4175,9 +4603,10 @@ "switchbot" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4186,6 +4615,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4218,6 +4648,8 @@ ]; "synology_dsm" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -4226,6 +4658,8 @@ ]; "system_bridge" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4234,6 +4668,8 @@ ]; # missing inputs: systembridgeconnector "system_health" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "system_log" = ps: with ps; [ ]; @@ -4260,6 +4696,8 @@ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hatasmota janus paho-mqtt @@ -4274,11 +4712,15 @@ ]; "telegram" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysocks python-telegram-bot ]; "telegram_bot" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysocks python-telegram-bot ]; @@ -4310,9 +4752,10 @@ "thermobeacon" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4321,6 +4764,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4338,9 +4782,10 @@ "thermopro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4349,6 +4794,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4374,6 +4820,8 @@ ]; "thread" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4398,9 +4846,10 @@ "tilt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4409,6 +4858,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4434,6 +4884,8 @@ ]; "todo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "todoist" = ps: with ps; [ todoist-api-python @@ -4448,16 +4900,25 @@ ]; "toon" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy toonapi webrtc-noise-gain ]; "torque" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "totalconnect" = ps: with ps; [ total-connect-client @@ -4466,6 +4927,8 @@ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4479,6 +4942,8 @@ ]; "traccar" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pytraccar stringcase ]; @@ -4516,6 +4981,9 @@ ]; "tts" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg mutagen ]; "tuya" = ps: with ps; [ @@ -4527,14 +4995,20 @@ ]; "twilio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twinkly" = ps: with ps; [ @@ -4542,6 +5016,8 @@ ]; "twitch" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4575,6 +5051,8 @@ ]; "unifiprotect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyunifiprotect unifi-discovery ]; @@ -4593,6 +5071,8 @@ ]; "upnp" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -4610,6 +5090,8 @@ ]; "usb" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -4625,6 +5107,9 @@ "uvc" = ps: with ps; [ uvcclient ]; + "v2c" = ps: with ps; [ + pytrydan + ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ @@ -4634,6 +5119,8 @@ ]; # missing inputs: vtjp "velbus" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -4691,6 +5178,9 @@ ]; "voip" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents mutagen @@ -4747,12 +5237,16 @@ ]; "webhook" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "webostv" = ps: with ps; [ aiowebostv ]; "websocket_api" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4778,19 +5272,25 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiowithings fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain ]; "wiz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4817,12 +5317,22 @@ "wsdot" = ps: with ps; [ ]; "wyoming" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg + hassil + home-assistant-intents + mutagen + webrtc-noise-gain wyoming ]; "x10" = ps: with ps; [ ]; "xbox" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4840,9 +5350,10 @@ "xiaomi_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4851,6 +5362,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4885,9 +5397,10 @@ "yalexs_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4896,6 +5409,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4913,6 +5427,8 @@ ]; "yamaha_musiccast" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiomusiccast async-upnp-client fnv-hash-fast @@ -4931,6 +5447,8 @@ ]; "yeelight" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4947,6 +5465,8 @@ ]; "yolink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4957,6 +5477,8 @@ ]; "youtube" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4972,6 +5494,8 @@ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4988,6 +5512,8 @@ ]; # missing inputs: zeversolar "zha" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -5019,6 +5545,8 @@ ]; "zwave_js" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -5028,6 +5556,8 @@ ]; "zwave_me" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5157,6 +5687,7 @@ "demo" "denonavr" "derivative" + "devialet" "device_automation" "device_sun_light_trigger" "device_tracker" @@ -5582,7 +6113,6 @@ "risco" "rituals_perfume_genie" "rmvtransport" - "roborock" "roku" "roomba" "roon" @@ -5746,6 +6276,7 @@ "usgs_earthquakes_feed" "utility_meter" "uvc" + "v2c" "vacuum" "vallox" "velbus" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7f6fca8a090b..12c1fa737c47 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,24 +30,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { - aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { - version = "0.2.4"; - src = fetchFromGitHub { - owner = "CorantGmbH"; - repo = "aioairq"; - rev = "refs/tags/v${version}"; - hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; - }; - }); - # https://github.com/home-assistant/core/pull/101913 aiohttp = super.aiohttp.overridePythonAttrs (old: rec { - version = "3.8.5"; + version = "3.9.1"; src = fetchPypi { inherit (old) pname; inherit version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + hash = "sha256-j8Sah6wmnUUp2kWHHi/7aHTod3nD0OLM2BPAiZIhI50="; }; + patches = []; + doCheck = false; }); aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { @@ -60,6 +52,15 @@ let }; }); + aioresponses = super.aioresponses.overridePythonAttrs (oldAttrs: rec { + pname = "aioresponses"; + version = "0.7.6"; + src = fetchPypi { + inherit pname version; + hash = "sha256-95XZ29otYXdIQOfjL1Nm9FdS0a3Bt0yTYq/QFylsfuE="; + }; + }); + astral = super.astral.overridePythonAttrs (oldAttrs: rec { pname = "astral"; version = "2.2"; @@ -135,11 +136,6 @@ let }; }); - # moto tests are a nuissance - moto = super.moto.overridePythonAttrs (_: { - doCheck = false; - }); - notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { version = "0.1.5"; format = "setuptools"; @@ -183,15 +179,6 @@ let }; }); - p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { - version = "2.1.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU="; - }; - }); - psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { version = "5.9.6"; src = fetchPypi { @@ -324,7 +311,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.11.3"; + hassVersion = "2023.12.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -340,7 +327,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-llGHI6LVpTo9m2RMtcDSkW2wWraje2OkVFx5P7lzZ30="; + hash = "sha256-TspjqX98adi6cYe/raV1FB5Xy59F4jWJukw1pkuP+Sw="; }; # Secondary source is git for tests @@ -348,7 +335,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-KD53O+UlAjGfVGp4kbLgpgU7j0A+KqZZT492WmeCOnQ="; + hash = "sha256-d7H6U5wRU1mOAU5YFyy7gtttsG9p1g7iDxZcaK+cAOg="; }; nativeBuildInputs = with python.pkgs; [ @@ -481,6 +468,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect tests/test_config.py::test_merge" # AssertionError: assert 'WARNING' not in '2023-11-10 ...nt abc[L]>\n'" "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" + # SystemError: PyThreadState_SetAsyncExc failed + "--deselect=tests/helpers/test_template.py::test_template_timeout" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1c7bc02172b2..50c5945ad377 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20231030.2"; + version = "20231206.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-qzodzqWpAXZjwBJkiCyBi5zzfpEqqtauJn2PKZ5UtJ0="; + hash = "sha256-RZRZ7feaW47DRCIKsesdkURG24ZacD2y3O3ppasbftk="; }; # there is nothing to strip in this package From 0e6e1a6f35a4d74aad590bce4739ea07f8baf1b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 03:04:02 +0100 Subject: [PATCH 38/53] python311Packages.homeassistant-stubs: 2023.11.3 -> 2023.12.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.12.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b6d6d1517af8..445c8dfd046a 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.11.3"; + version = "2023.12.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-x3FcUmbUYAUKGAPb85SqJk1kTWFKxpJSX2J+rTRj1KY="; + hash = "sha256-14zxVCxYtmEe71f+wqgvT/lKiv7DMN7PaeYrkQG4kMQ="; }; nativeBuildInputs = [ From fd9b39821d3dc499491894bb2e83308f2b9e1286 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 17:10:14 +0100 Subject: [PATCH 39/53] python311Packages.hass-nabucasa: fix tests with aiohttp 3.9.1 --- .../python-modules/hass-nabucasa/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e27ef7ffce6b..edb90b477d0e 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -7,6 +7,7 @@ , ciso8601 , cryptography , fetchFromGitHub +, fetchpatch , pycognito , pytest-aiohttp , pytest-timeout @@ -32,12 +33,13 @@ buildPythonPackage rec { hash = "sha256-r4Huvn9mBqnASpUd+drwORE+fApLV/l6Y3aO/UIiEC8="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "acme==" "acme>=" \ - --replace "pycognito==" "pycognito>=" \ - --replace "snitun==" "snitun>=" \ - ''; + patches = [ + (fetchpatch { + # Add missing wait_for_close mock in AiohttpClientMockResponse + url = "https://github.com/NabuCasa/hass-nabucasa/commit/097607e0fe30932ca5cba0c50fda125f90f5f3de.patch"; + hash = "sha256-ZSh+1kGBb6ltNnd0RaDECXiJDEGJBOw1wN2HXPgfy+o="; + }) + ]; nativeBuildInputs = [ setuptools From 0645ff3b624febeae63993920bff562a2f6ab73a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Dec 2023 23:46:49 +0100 Subject: [PATCH 40/53] nixos/home-assistant: update bluetooth components eq3btsmart was removed in 2023.12.0. --- nixos/modules/services/home-automation/home-assistant.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0a399e0774d1..d576af2fbb4f 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -523,7 +523,6 @@ in { "bluetooth_tracker" "bthome" "default_config" - "eq3btsmart" "eufylife_ble" "esphome" "fjaraskupan" From a9c8c99442748f1580909f3642008d8acb43d42d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 02:39:32 +0100 Subject: [PATCH 41/53] home-assistant: make git the primary source, sdist secondary Make the git src the primary one, since it can be replaced with a local checkout to run bisects. We now copy the translations from the sdist published on PyPi into the source tree, instead of previously the tests from the git source tree. --- pkgs/servers/home-assistant/default.nix | 21 ++++++++++----------- pkgs/servers/home-assistant/update.py | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 12c1fa737c47..71ef528549f9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -324,20 +324,20 @@ in python.pkgs.buildPythonApplication rec { # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; - # Primary source is the pypi sdist, because it contains translations - src = fetchPypi { - inherit pname version; - hash = "sha256-TspjqX98adi6cYe/raV1FB5Xy59F4jWJukw1pkuP+Sw="; - }; - - # Secondary source is git for tests - gitSrc = fetchFromGitHub { + # Primary source is the git, which has the tests and allows bisecting the core + src = fetchFromGitHub { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; hash = "sha256-d7H6U5wRU1mOAU5YFyy7gtttsG9p1g7iDxZcaK+cAOg="; }; + # Secondary source is pypi sdist for translations + sdist = fetchPypi { + inherit pname version; + hash = "sha256-TspjqX98adi6cYe/raV1FB5Xy59F4jWJukw1pkuP+Sw="; + }; + nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook setuptools @@ -365,10 +365,9 @@ in python.pkgs.buildPythonApplication rec { "yarl" ]; - # copy tests early, so patches apply as they would to the git repo + # extract translations from pypi sdist prePatch = '' - cp --no-preserve=mode --recursive ${gitSrc}/tests ./ - chmod u+x tests/auth/providers/test_command_line_cmd.sh + tar --extract --gzip --file $sdist --strip-components 1 --wildcards "**/translations" ''; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index c914979e28bd..30b371e0686d 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -192,11 +192,11 @@ class HomeAssistant: async def update_core(self, old_version: str, new_version: str) -> None: - old_sdist_hash = str(await Nix.eval("home-assistant.src.outputHash")) + old_sdist_hash = str(await Nix.eval("home-assistant.sdist.outputHash")) new_sdist_hash = await Nurl.prefetch("https://pypi.org/project/homeassistant/", new_version) print(f"sdist: {old_sdist_hash} -> {new_sdist_hash}") - old_git_hash = str(await Nix.eval("home-assistant.gitSrc.outputHash")) + old_git_hash = str(await Nix.eval("home-assistant.src.outputHash")) new_git_hash = await Nurl.prefetch("https://github.com/home-assistant/core/", new_version) print(f"git: {old_git_hash} -> {new_git_hash}") From 4324d082b2476b43a12aa857b27771cb456c64dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 16:29:33 +0100 Subject: [PATCH 42/53] nixos/tests/home-assistant: check for lovelace resources in config This was recently fixed, but the test was not updated. --- nixos/tests/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 9200723f35e7..05fb2fa1e06a 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -182,7 +182,7 @@ in { hass.wait_until_succeeds("journalctl -u home-assistant.service | grep -q 'We found a custom integration prometheus_sensor which has not been tested by Home Assistant'") with subtest("Check that lovelace modules are referenced and fetchable"): - hass.succeed("grep -q 'mini-graph-card-bundle.js' '${configDir}/ui-lovelace.yaml'") + hass.succeed("grep -q 'mini-graph-card-bundle.js' '${configDir}/configuration.yaml'") hass.succeed("curl --fail http://localhost:8123/local/nixos-lovelace-modules/mini-graph-card-bundle.js") with subtest("Check that optional dependencies are in the PYTHONPATH"): From 982ca8967d21475436f8f92b4594762fdd0a1510 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 02:38:01 +0100 Subject: [PATCH 43/53] home-assistant: don't depend on matter implicitly The matter integration is still stuck on OpenSSL 1.1, which is marked as insecure. Propagating matter through `after_dependencies` makes most of home-assistant transitively insecure. Unfortunately that requires disabling a number of core tests. --- .../home-assistant/component-packages.nix | 38 ------------------- pkgs/servers/home-assistant/default.nix | 14 +++++++ .../home-assistant/parse-requirements.py | 9 ++++- 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8fd46bf70e87..9cbb9981bada 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -631,7 +631,6 @@ plexwebsocket psutil-home-assistant pychromecast - python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -670,16 +669,12 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen - psutil-home-assistant - python-matter-server pyturbojpeg - sqlalchemy webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ @@ -820,7 +815,6 @@ psutil-home-assistant pynacl pyserial - python-matter-server pyturbojpeg pyudev scapy @@ -1631,11 +1625,7 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast - psutil-home-assistant - python-matter-server pyturbojpeg - sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors @@ -2668,17 +2658,13 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents loqedapi mutagen - psutil-home-assistant - python-matter-server pyturbojpeg - sqlalchemy webrtc-noise-gain ]; "lovelace" = ps: with ps; [ @@ -2958,7 +2944,6 @@ pillow psutil-home-assistant pynacl - python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3165,7 +3150,6 @@ mutagen psutil-home-assistant pyatmo - python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3480,7 +3464,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil @@ -3488,11 +3471,8 @@ janus mutagen paho-mqtt - psutil-home-assistant pynacl - python-matter-server pyturbojpeg - sqlalchemy webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ @@ -3582,17 +3562,13 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen - psutil-home-assistant pyplaato - python-matter-server pyturbojpeg - sqlalchemy webrtc-noise-gain ]; "plant" = ps: with ps; [ @@ -3783,17 +3759,13 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen - psutil-home-assistant - python-matter-server pyturbojpeg rachiopy - sqlalchemy webrtc-noise-gain ]; "radarr" = ps: with ps; [ @@ -3883,7 +3855,6 @@ mutagen pillow psutil-home-assistant - python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -4354,18 +4325,14 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen - psutil-home-assistant pysmartapp pysmartthings - python-matter-server pyturbojpeg - sqlalchemy webrtc-noise-gain ]; "smarttub" = ps: with ps; [ @@ -4902,16 +4869,12 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen - psutil-home-assistant - python-matter-server pyturbojpeg - sqlalchemy toonapi webrtc-noise-gain ]; @@ -5282,7 +5245,6 @@ home-assistant-intents mutagen psutil-home-assistant - python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 71ef528549f9..dfa87bc04552 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -469,6 +469,18 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # SystemError: PyThreadState_SetAsyncExc failed "--deselect=tests/helpers/test_template.py::test_template_timeout" + # Various test failures, because we don't provide matter + # dependencies, because they depend on OpenSSL 1.1 + # https://github.com/home-assistant-libs/chip-wheels/issues/24 + # https://github.com/project-chip/connectedhomeip/issues/25688 + "--deselect=tests/helpers/test_config_entry_flow.py::test_webhook_create_cloudhook" + "--deselect=tests/helpers/test_config_entry_flow.py::test_webhook_create_cloudhook_aborts_not_connected" + "--deselect=tests/helpers/test_script.py::test_validate_action_config" + "--deselect=tests/test_bootstrap.py::test_setup_hass_invalid_core_config" + "--deselect=tests/test_bootstrap.py::test_setup_hass_invalid_yaml" + "--deselect=tests/test_bootstrap.py::test_setup_hass_recovery_mode" + "--deselect=tests/test_bootstrap.py::test_setup_hass_recovery_mode_and_safe_mode" + "--deselect=tests/test_bootstrap.py::test_setup_recovery_mode_if_no_frontend" # tests are located in tests/ "tests" ]; @@ -480,6 +492,8 @@ in python.pkgs.buildPythonApplication rec { "tests/pylint" # don't bulk test all components "tests/components" + # depends on matter depenency + "tests/helpers/test_network.py" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index bb5e70994320..ca1dc70909f5 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -119,7 +119,14 @@ def parse_components(version: str = "master"): def get_reqs(components: Dict[str, Dict[str, Any]], component: str, processed: Set[str]) -> Set[str]: requirements = set(components[component].get("requirements", [])) deps = components[component].get("dependencies", []) - deps.extend(components[component].get("after_dependencies", [])) + after_deps = components[component].get("after_dependencies", []) + try: + # Don't propagate matter dependency through after_dependencies + # TODO: remove after matter integration moves past OpenSSL 1.1 + after_deps.remove("matter") + except ValueError: + pass + deps.extend(after_deps) processed.add(component) for dependency in deps: if dependency not in processed: From 2e6cc4ac328ecb40555624997dbf24606d19ed3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 18:24:49 +0100 Subject: [PATCH 44/53] python311Packages.python-myq: eject The service provider decided to block acecss from unvetted third parties which in turn led to the removal of the integration from home-assistant. --- .../python-modules/python-myq/default.nix | 54 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/python-myq/default.nix diff --git a/pkgs/development/python-modules/python-myq/default.nix b/pkgs/development/python-modules/python-myq/default.nix deleted file mode 100644 index 88248abde3a3..000000000000 --- a/pkgs/development/python-modules/python-myq/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, aiohttp -, beautifulsoup4 -, buildPythonPackage -, fetchFromGitHub -, pkce -, poetry-core -, pythonOlder -}: - -buildPythonPackage rec { - pname = "python-myq"; - version = "3.1.13"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "Python-MyQ"; - repo = "Python-MyQ"; - rev = "refs/tags/v${version}"; - hash = "sha256-kW03swRXZdkh45I/up/FIxv0WGBRqTlDt1X71Ow/hrg="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry-core==1.6.1" "poetry-core" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - beautifulsoup4 - pkce - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ - "pymyq" - ]; - - meta = with lib; { - description = "Python wrapper for MyQ API"; - homepage = "https://github.com/Python-MyQ/Python-MyQ"; - changelog = "https://github.com/Python-MyQ/Python-MyQ/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c2bd5f390409..eaa24f7452df 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -312,6 +312,7 @@ mapAliases ({ pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 pymyq = python-myq; # added 2023-10-20 + python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20bef22ff444..0b2295d0e87a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10716,8 +10716,6 @@ self: super: with self; { pymvglive = callPackage ../development/python-modules/pymvglive { }; - python-myq = callPackage ../development/python-modules/python-myq { }; - pymysensors = callPackage ../development/python-modules/pymysensors { }; pymysql = callPackage ../development/python-modules/pymysql { }; From 04c2893d58e7fc78f1f0b287058cdbb45db24acb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 19:16:44 +0100 Subject: [PATCH 45/53] nixos/home-assistant: fix broken reference in option example --- nixos/modules/services/home-automation/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index d576af2fbb4f..7f7a76ed19da 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -157,7 +157,7 @@ in { default = []; example = literalExpression '' with pkgs.home-assistant-custom-components; [ - prometheus-sensor + prometheus_sensor ]; ''; description = lib.mdDoc '' From 4bd6bec027606a42e88911135e933f6a4bde6783 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 7 Dec 2023 23:10:40 +0100 Subject: [PATCH 46/53] python311Packages.aiohomekit: disable failing tests Missing function on a mock object, likely through a too new version of zeroconf. --- .../development/python-modules/aiohomekit/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 86c186f4220f..79484a4beea9 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -60,6 +60,17 @@ buildPythonPackage rec { "tests/test_ip_pairing.py" ]; + disabledTests = [ + # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties' + "test_discover_find_one_unpaired" + "test_find_device_id_case_lower" + "test_find_device_id_case_upper" + "test_discover_missing_csharp" + "test_discover_csharp_case" + "test_discover_device_id_case_lower" + "test_discover_device_id_case_upper" + ]; + pythonImportsCheck = [ "aiohomekit" ]; From 009033bc3c4cd582f9744a95653bbf799acdd52c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Dec 2023 01:27:00 +0100 Subject: [PATCH 47/53] python311Packages.yolink-api: 0.3.3 -> 0.3.4 https://github.com/YoSmart-Inc/yolink-api/releases/tag/v0.3.4 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 4b7bec230bbb..ceff77e4d2b7 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Kg7EvMoFMNm7+Upxo1RIyzrOFsz9dQu1YYiEuetlXBk="; + hash = "sha256-wDZlzl178SIXxo5SacbbXWHhF4wOsjBU4a9h0jBYA4c="; }; nativeBuildInputs = [ From c3d64d2d589290e537dea71353187c6ce32d8e58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Dec 2023 02:03:56 +0100 Subject: [PATCH 48/53] python311Packages.pytraccar: disable tests when aiohttp>=3.9.0 --- pkgs/development/python-modules/pytraccar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index e622eeba73f6..6bd4c17f50ea 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, aresponses , buildPythonPackage , fetchFromGitHub , poetry-core @@ -31,8 +30,10 @@ buildPythonPackage rec { aiohttp ]; + # https://github.com/ludeeus/pytraccar/issues/31 + doCheck = lib.versionOlder aiohttp.version "3.9.0"; + nativeCheckInputs = [ - aresponses pytestCheckHook pytest-asyncio ]; From 11c3032b987970198e1f4a2f5ad71cdbdf0afd36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Dec 2023 02:12:31 +0100 Subject: [PATCH 49/53] python311Packages.pysmartthings: disable tests when aiohttp>=3.9.0 --- .../python-modules/pysmartthings/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index 369cd6ecea6e..89b6ba537aec 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -21,20 +21,23 @@ buildPythonPackage rec { hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp>=3.8.0,<4.0.0" "aiohttp<=4.0.0" + ''; + propagatedBuildInputs = [ aiohttp ]; + # https://github.com/andrewsayre/pysmartthings/issues/80 + doCheck = lib.versionOlder aiohttp.version "3.9.0"; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "aiohttp>=3.8.0,<4.0.0" "aiohttp<=4.0.0" - ''; - pythonImportsCheck = [ "pysmartthings" ]; From 1e8a9f5f20902cea5340c521a08c7f2943c0c94c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 17:14:07 +0100 Subject: [PATCH 50/53] Revert "home-assistant: don't depend on matter implicitly" This reverts commit c3b7d93d1282cda4713b3608a43d34d57a26727f. Make the trade-off, that everything gets transitively marked insecure, as opposed to having lots of broken test and no signaling, when they'd actually break. --- .../home-assistant/component-packages.nix | 38 +++++++++++++++++++ pkgs/servers/home-assistant/default.nix | 14 ------- .../home-assistant/parse-requirements.py | 9 +---- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9cbb9981bada..8fd46bf70e87 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -631,6 +631,7 @@ plexwebsocket psutil-home-assistant pychromecast + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -669,12 +670,16 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ @@ -815,6 +820,7 @@ psutil-home-assistant pynacl pyserial + python-matter-server pyturbojpeg pyudev scapy @@ -1625,7 +1631,11 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors @@ -2658,13 +2668,17 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents loqedapi mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "lovelace" = ps: with ps; [ @@ -2944,6 +2958,7 @@ pillow psutil-home-assistant pynacl + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3150,6 +3165,7 @@ mutagen psutil-home-assistant pyatmo + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3464,6 +3480,7 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil @@ -3471,8 +3488,11 @@ janus mutagen paho-mqtt + psutil-home-assistant pynacl + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ @@ -3562,13 +3582,17 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pyplaato + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "plant" = ps: with ps; [ @@ -3759,13 +3783,17 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg rachiopy + sqlalchemy webrtc-noise-gain ]; "radarr" = ps: with ps; [ @@ -3855,6 +3883,7 @@ mutagen pillow psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -4325,14 +4354,18 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pysmartapp pysmartthings + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "smarttub" = ps: with ps; [ @@ -4869,12 +4902,16 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy toonapi webrtc-noise-gain ]; @@ -5245,6 +5282,7 @@ home-assistant-intents mutagen psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index dfa87bc04552..71ef528549f9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -469,18 +469,6 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # SystemError: PyThreadState_SetAsyncExc failed "--deselect=tests/helpers/test_template.py::test_template_timeout" - # Various test failures, because we don't provide matter - # dependencies, because they depend on OpenSSL 1.1 - # https://github.com/home-assistant-libs/chip-wheels/issues/24 - # https://github.com/project-chip/connectedhomeip/issues/25688 - "--deselect=tests/helpers/test_config_entry_flow.py::test_webhook_create_cloudhook" - "--deselect=tests/helpers/test_config_entry_flow.py::test_webhook_create_cloudhook_aborts_not_connected" - "--deselect=tests/helpers/test_script.py::test_validate_action_config" - "--deselect=tests/test_bootstrap.py::test_setup_hass_invalid_core_config" - "--deselect=tests/test_bootstrap.py::test_setup_hass_invalid_yaml" - "--deselect=tests/test_bootstrap.py::test_setup_hass_recovery_mode" - "--deselect=tests/test_bootstrap.py::test_setup_hass_recovery_mode_and_safe_mode" - "--deselect=tests/test_bootstrap.py::test_setup_recovery_mode_if_no_frontend" # tests are located in tests/ "tests" ]; @@ -492,8 +480,6 @@ in python.pkgs.buildPythonApplication rec { "tests/pylint" # don't bulk test all components "tests/components" - # depends on matter depenency - "tests/helpers/test_network.py" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index ca1dc70909f5..bb5e70994320 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -119,14 +119,7 @@ def parse_components(version: str = "master"): def get_reqs(components: Dict[str, Dict[str, Any]], component: str, processed: Set[str]) -> Set[str]: requirements = set(components[component].get("requirements", [])) deps = components[component].get("dependencies", []) - after_deps = components[component].get("after_dependencies", []) - try: - # Don't propagate matter dependency through after_dependencies - # TODO: remove after matter integration moves past OpenSSL 1.1 - after_deps.remove("matter") - except ValueError: - pass - deps.extend(after_deps) + deps.extend(components[component].get("after_dependencies", [])) processed.add(component) for dependency in deps: if dependency not in processed: From d9e209e1fea7acf45e146c1a96886e891497b8f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 17:58:38 +0100 Subject: [PATCH 51/53] python311Packages.python-bsblan: disable tests that fail with aiohttp 3.9.1 --- pkgs/development/python-modules/python-bsblan/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 2ffc8ed0b7f2..bfa3f38e4597 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -55,6 +55,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ + # https://github.com/liudger/python-bsblan/issues/808 + "test_http_error400" + "test_not_authorized_401_response" + ]; + pythonImportsCheck = [ "bsblan" ]; From 9755134150a5469ab6b32a086c2eff4bb89e1f72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 18:12:19 +0100 Subject: [PATCH 52/53] home-assistant: use overridden dependencies in overrides --- pkgs/servers/home-assistant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 71ef528549f9..9c9a8f12f123 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -106,10 +106,10 @@ let rev = "refs/tags/${version}"; hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; }; - nativeBuildInputs = with super; [ + nativeBuildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ aenum aiohttp pydantic @@ -147,11 +147,11 @@ let hash = "sha256-adkcUuPl0jdJjkBINCTW4Kmc16C/HzL+jaRZB/Qr09A="; }; - nativeBuildInputs = with super; [ + nativeBuildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ requests ]; From b9dfed786953ce8f29eddf4458103da2c535f619 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 18:18:58 +0100 Subject: [PATCH 53/53] python311Packages.pymodbus: disable failing tests with aiohttp 3.9.0 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 539502db35b3..4c6676ae97a0 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -72,6 +72,10 @@ buildPythonPackage rec { disabledTests = [ # Tests often hang "test_connected" + ] ++ lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ + "test_split_serial_packet" + "test_serial_poll" + "test_simulator" ]; meta = with lib; {