From cbf6d89a8204599966bdb93b49d5e9730fc0e80d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:58 +0100 Subject: [PATCH 01/33] python3Packages.voluptuous-serialize: 2.5.0 -> 2.6.0 https://github.com/home-assistant-libs/voluptuous-serialize/releases/tag/2.6.0 --- .../voluptuous-serialize/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 2cb55c69cec7..f35ab607a07c 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -8,25 +8,30 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.5.0"; + version = "2.6.0"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; - rev = version; - sha256 = "sha256-8rWMz8tBanxHdU/F4HhBxxz3ltqbdRoP4JED2dmZfTk="; + repo = "voluptuous-serialize"; + rev = "refs/tags/${version}"; + hash = "sha256-vvreXSQDkA3JkZpOKZqJgMRyObJX/cSR8r+A26h9fNE="; }; - propagatedBuildInputs = [ voluptuous ]; + propagatedBuildInputs = [ + voluptuous + ]; nativeCheckInputs = [ pytestCheckHook voluptuous ]; - pythonImportsCheck = [ "voluptuous_serialize" ]; + pythonImportsCheck = [ + "voluptuous_serialize" + ]; meta = with lib; { homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; From fc31b4f09aaac53c6d801db864ce436fc79b3801 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 21 Feb 2023 03:09:20 +0100 Subject: [PATCH 02/33] python310Packages.syrupy: 3.0.6 -> 4.0.1 https://github.com/tophat/syrupy/releases/tag/v4.0.0 https://github.com/tophat/syrupy/releases/tag/v4.0.1 --- .../python-modules/syrupy/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 3ad320751acb..8b22b098a8ce 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -1,22 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pytest , colored -, pytestCheckHook +, invoke }: buildPythonPackage rec { pname = "syrupy"; - version = "3.0.6"; + version = "4.0.1"; format = "pyproject"; + disabled = pythonOlder "3.8.1"; + src = fetchFromGitHub { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM="; + hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE="; }; nativeBuildInputs = [ @@ -32,9 +35,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + invoke + pytest ]; + checkPhase = '' + runHook preCheck + # https://github.com/tophat/syrupy/blob/main/CONTRIBUTING.md#local-development + invoke test + runHook postCheck + ''; + meta = with lib; { changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}"; description = "Pytest Snapshot Test Utility"; From 5b69f3af2d9274ac76c9453eacc61f312fb94e9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Feb 2023 17:58:56 +0100 Subject: [PATCH 03/33] python3Packages.textual: Disable snapshot tests at least until they have caught up with changes in syrupy 4.0. --- pkgs/development/python-modules/textual/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 5decea07774d..2b9a035c60dd 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -59,6 +59,11 @@ buildPythonPackage rec { time-machine ]; + disabledTestPaths = [ + # snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + ]; + pythonImportsCheck = [ "textual" ]; From ab18e1b564ecb2fc276c0a48b009d87791d99034 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Feb 2023 03:50:28 +0100 Subject: [PATCH 04/33] hassil: 0.2.6 -> 1.0.6 https://github.com/home-assistant/hassil/releases/tag/v1.0.0 https://github.com/home-assistant/hassil/releases/tag/v1.0.1 https://github.com/home-assistant/hassil/releases/tag/v1.0.4 --- .../python-modules/hassil/default.nix | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index c8949968536c..1b80c9a4986e 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -1,13 +1,10 @@ { lib , buildPythonPackage , fetchPypi - -# build -, antlr4 +, pythonOlder # propagates -, antlr4-python3-runtime -, dataclasses-json +, importlib-resources , pyyaml # tests @@ -16,7 +13,7 @@ let pname = "hassil"; - version = "0.2.6"; + version = "1.0.6"; in buildPythonPackage { inherit pname version; @@ -24,23 +21,13 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; + hash = "sha256-rCSVKFIkfPg2aYFwuYVLMxMO8S11dV8f4eckpFbNB3k="; }; - nativeBuildInputs = [ - antlr4 - ]; - - postPatch = '' - sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt - rm hassil/grammar/*.{tokens,interp} - antlr -Dlanguage=Python3 -visitor -o hassil/grammar/ *.g4 - ''; - propagatedBuildInputs = [ - antlr4-python3-runtime - dataclasses-json pyyaml + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; nativeCheckInputs = [ From 0b9bbd0de44d956fa15ff429de59c06b77983a24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Mar 2023 16:15:08 +0100 Subject: [PATCH 05/33] home-assistant.intents: 2023.1.31 -> 2023.2.28 --- 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 8c8470113c4c..94fe8ef3ffbd 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.1.31"; + version = "2023.2.28"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents"; rev = "refs/tags/${version}"; - hash = "sha256-buq/SLXDFP0xvIb2yGiHQzuL7HKvc7bxxdkhq4KHpvM="; + hash = "sha256-u9CLPikht+T9wdQpLELPH/t+pZNcaOfbtfWT6DBwZaw="; }; sourceRoot = "source/package"; From d91d782974995ec9474f02bf7baea26d7c5603a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 20:45:49 +0100 Subject: [PATCH 06/33] python310Packages.aiohue: 4.6.1 -> 4.6.2 Diff: https://github.com/home-assistant-libs/aiohue/compare/refs/tags/4.6.1...4.6.2 Changelog: https://github.com/home-assistant-libs/aiohue/releases/tag/4.6.2 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index f4248a27ddde..efd590e7e827 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ATM4s2W1Gw98TysfqHVA/McerZStHaUK5eMrSU9+uOI="; + hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU="; }; propagatedBuildInputs = [ From 3731799d9f140b65225492a22bb87f490b95244a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:48:14 +0100 Subject: [PATCH 07/33] python310Packages.brother: 2.1.1 -> 2.2.0 Diff: https://github.com/bieniu/brother/compare/refs/tags/2.1.1...2.2.0 --- pkgs/development/python-modules/brother/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 55dc7fd2202b..eaf7f1d44dc7 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "brother"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jMvbZ4/NOA3dnJUdDWk2KTRz1gBOC+oDE0ChGNdFl1o="; + hash = "sha256-bp4YerSTTsuWX3Yc+btlhwCNZO3eDxRgKNzLZFJbKV0="; }; propagatedBuildInputs = [ From 93414a06d5338cc20237bc02d538b22d50f7091a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:51:38 +0100 Subject: [PATCH 08/33] python310Packages.brother: add changelog to meta --- pkgs/development/python-modules/brother/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index eaf7f1d44dc7..71e8f9d29dd1 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP"; homepage = "https://github.com/bieniu/brother"; + changelog = "https://github.com/bieniu/brother/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; From f72d45c6699cdc4126e9a74d76286865bc7d544c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:15 +0100 Subject: [PATCH 09/33] python3Packages.devolo-plc-api: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/devolo-plc-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index e8bccf2928aa..643674f4f0a1 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo="; + hash = "sha256-Ua6XxFmvF2EDtCZTeVHGRfwNAMjX3p5s4Jo5ylutYqY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 3f81a95a1b45a8e048e97ffc7de2d88e63826ec5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:17 +0100 Subject: [PATCH 10/33] python3Packages.elgato: 3.0.0 -> 4.0.1 --- pkgs/development/python-modules/elgato/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 2fbaa7f66ae5..16b468ab621a 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "elgato"; - version = "3.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; - rev = "v${version}"; - sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; }; nativeBuildInputs = [ From 418d7bf54108391876fdd72177f71684db1414a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:31 +0100 Subject: [PATCH 11/33] python3Packages.nettigo-air-monitor: 1.6.0 -> 2.1.0 --- .../python-modules/nettigo-air-monitor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 71cd3b9a260d..58f65b6e3d46 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.6.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; repo = pname; - rev = version; - hash = "sha256-86YEpn3rI6Y4v0pcNk+/4tHCUzXpXZN5xwV9M/1gZ8U="; + rev = "refs/tags/${version}"; + hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8="; }; propagatedBuildInputs = [ From f15e7abe51cebac587fa1779d0fb54e8060a2c9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:32 +0100 Subject: [PATCH 12/33] python3Packages.nibe: 1.6.0 -> 2.0.0 --- pkgs/development/python-modules/nibe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 825f89354e56..ee51cdd7cd50 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "1.6.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6pQsVGb26FpoV2LgOrs+Cfq2rATRqbljrVJ+NsZUSuc="; + hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw="; }; nativeBuildInputs = [ From 2bdf9b0452117f0a233ebb0829a9906aa1c266b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:37 +0100 Subject: [PATCH 13/33] python3Packages.pyairnow: 1.1.0 -> 1.2.1 --- .../python-modules/pyairnow/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 04206796d4d6..e398643aa510 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,7 +3,6 @@ , aioresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-aiohttp , poetry-core , pytest-asyncio @@ -13,24 +12,16 @@ buildPythonPackage rec { pname = "pyairnow"; - version = "1.1.0"; + version = "1.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "asymworks"; repo = pname; - rev = "v${version}"; - sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; + rev = "refs/tags/v${version}"; + hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk="; }; - patches = [ - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch"; - hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; From 895a883e2f281dd90d2e1fa49de78084bdf0b45d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:37 +0100 Subject: [PATCH 14/33] python3Packages.pybalboa: 0.13 -> 1.0.0 --- .../development/python-modules/pybalboa/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index 3c290b843941..7c6a477c7c3d 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -2,22 +2,27 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "pybalboa"; - version = "0.13"; - format = "setuptools"; + version = "1.0.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "garbled1"; repo = pname; - rev = version; - sha256 = "0aw5jxpsvzyx05y1mg8d63lxx1i607yb6x19n9jil5wfis95m8pd"; + rev = "refs/tags/${version}"; + hash = "sha256-08FMNRArzmfmLH6y5Z8QPcRVZJIvU3VIOvdTry3iBGI="; }; + nativeBuildInputs = [ + poetry-core + ]; + # Project has no tests doCheck = false; From 7b94126918bca0c83abab2857b355880aa612050 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 00:51:55 +0100 Subject: [PATCH 15/33] python310Packages.pyinsteon: 1.2.0 -> 1.3.3 https://github.com/pyinsteon/pyinsteon/releases/tag/1.3.0 https://github.com/pyinsteon/pyinsteon/releases/tag/1.3.1 https://github.com/pyinsteon/pyinsteon/releases/tag/1.3.2 https://github.com/pyinsteon/pyinsteon/releases/tag/1.3.3 --- .../python-modules/pyinsteon/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 70f76c129f02..400791197b6f 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -7,17 +7,16 @@ , pypubsub , pyserial , pyserial-asyncio -, pytest-asyncio -, pytest-timeout , pytestCheckHook , pythonOlder -, pyyaml +, setuptools +, voluptuous }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,29 +24,27 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs="; + hash = "sha256-zbqgwCukTmvCIXpAvaKQl7voOI4ATqsT9NPUyRhw2EE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp pypubsub pyserial pyserial-asyncio - pyyaml + voluptuous ]; nativeCheckInputs = [ async_generator - pytest-asyncio - pytest-timeout pytestCheckHook ]; - disabledTests = [ - "test_results" - ]; - pythonImportsCheck = [ "pyinsteon" ]; From cbfb4e70e3a6bce7ef066a438cd62f0db928126e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 00:55:36 +0100 Subject: [PATCH 16/33] python310Packages.home-assistant-chip-clusters: 2023.1.0 -> 2023.2.2 Changelog: https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.2.2 --- .../python-modules/home-assistant-chip-clusters/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 8807d0877bb8..67393f6f113f 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.1.0"; + version = "2023.2.2"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg="; + hash = "sha256-FsIE4dcZOP24/DX6TLnmoCHMYe4f9gWqmv2L25ujqu4="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-base APIs and tools for CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; From 32d2d372800a4d4dcbf1b477b972ba08ab51be5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 00:56:35 +0100 Subject: [PATCH 17/33] python310Packages.home-assistant-chip-core: 2023.1.0 -> 2023.2.2 Changelog: https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.2.2 --- .../python-modules/home-assistant-chip-core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index a3a8cf93b810..ebf7a9163875 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.1.0"; + version = "2023.2.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM="; + hash = "sha256-15olERnpfe4PbDsDfw47vsYsqjFe8P8IDmSSGxGLtx8="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-base APIs and tools for CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; platforms = [ "aarch64-linux" "x86_64-linux" ]; From bf65313eae66aa7edf364fc59970ab4626ec7f6b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 00:57:03 +0100 Subject: [PATCH 18/33] python310Packages.python-matter-server: 2.1.0 -> 3.1.0 Diff: https://github.com/home-assistant-libs/python-matter-server/compare/refs/tags/2.1.0...3.1.0 Changelog: https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.1.0 --- .../python-modules/python-matter-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index e59781180b38..0caf9f85e3e9 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "2.1.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU="; + hash = "sha256-nNf0Q3J5nrYDinMnl+p3HC4FYMX+GubYmtchfuATWms="; }; nativeBuildInputs = [ From 14eec01b9f2e06b722afc79e866742ab6b292f44 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 01:01:44 +0100 Subject: [PATCH 19/33] python310Packages.velbus-aio: 2022.12.0 -> 2023.2.0 Diff: https://github.com/Cereal2nd/velbus-aio/compare/2022.12.0...2023.2.0 Changelog: https://github.com/Cereal2nd/velbus-aio/releases/tag/2023.2.0 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 3c7b7ba03254..881c24d25b12 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.12.0"; + version = "2023.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - hash = "sha256-hhomNynH2X2tnCzVBmyF/sYsHLHyGGaR9oX6M7kcWVc="; + hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g="; fetchSubmodules = true; }; From d8fe6839b0dc3683edea9c4c2a6630dd5d2507f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Mar 2023 14:42:13 +0100 Subject: [PATCH 20/33] python310Packages.faust-cchardet: init at 2.1.18 --- .../python-modules/faust-cchardet/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/faust-cchardet/default.nix diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix new file mode 100644 index 000000000000..ca2cdc02162e --- /dev/null +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, pkgconfig +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "faust-cchardet"; + version = "2.1.18"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "faust-streaming"; + repo = "cChardet"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k="; + }; + + nativeBuildInputs = [ + cython + pkgconfig + setuptools + wheel + ]; + + pythonImportsCheck = [ + "cchardet" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst"; + description = "High-speed universal character encoding detector"; + homepage = "https://github.com/faust-streaming/cChardet"; + license = lib.licenses.mpl11; + maintainers = with lib.maintainers; [ dotlambda ivan ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 259f5de93347..79f3233af727 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3327,6 +3327,8 @@ self: super: with self; { fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; + faust-cchardet = callPackage ../development/python-modules/faust-cchardet { }; + favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; From 700ef6af814befa4a99c10ba0873e1bd485361a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:58 +0100 Subject: [PATCH 21/33] python3Packages.vulcan-api: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/vulcan-api/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index bde97b8e1245..a3e4c0c561a8 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -3,7 +3,7 @@ , aiodns , aiohttp , buildPythonPackage -, cchardet +, faust-cchardet , fetchFromGitHub , pyopenssl , pythonOlder @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ="; + hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik="; }; propagatedBuildInputs = [ aenum aiodns aiohttp - cchardet + faust-cchardet pyopenssl pytz related From a55411d777bbbdd66e0be50d028d489cdee6e0c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:14:59 +0100 Subject: [PATCH 22/33] python3Packages.xknx: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index af7f10e3fd8d..4237714f0508 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MSk/c2qLztq5GQ6+CzK0Jw+rOJTClguaoL284YaBPjw="; + hash = "sha256-dMjSdEqaocLmen3xs9Bols9GiGZ/ORZarwPNW74Z3YI="; }; propagatedBuildInputs = [ From 384200baaed71c4dd19a1a374561599c6d3d11d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 10:30:09 +0100 Subject: [PATCH 23/33] python310Packages.xknx: 2.5.0 -> 2.6.0 Diff: https://github.com/XKNX/xknx/compare/refs/tags/2.5.0...2.6.0 Changelog: https://github.com/XKNX/xknx/releases/tag/2.6.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 4237714f0508..bada705c78d8 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.5.0"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dMjSdEqaocLmen3xs9Bols9GiGZ/ORZarwPNW74Z3YI="; + hash = "sha256-ivqUego6a9ieSxgHKd3szVAE23zMI54nYqbZjHIgVVE="; }; propagatedBuildInputs = [ From 9a3140fff1a161b87642d1de23e52b927962a8dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:15:00 +0100 Subject: [PATCH 24/33] python3Packages.yolink-api: 0.1.5 -> 0.2.8 --- .../python-modules/yolink-api/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index e882a48c6332..b3cda18f7789 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -2,15 +2,17 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, paho-mqtt +, asyncio-mqtt , pydantic , pythonOlder +, setuptools +, tenacity }: buildPythonPackage rec { pname = "yolink-api"; - version = "0.1.5"; - format = "setuptools"; + version = "0.2.8"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,13 +20,18 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6Ch17aKUT8jVUo+pYD5EvydEzP/TTjLtgkUQJnHYkKg="; + hash = "sha256-dcuP2VPAp3Na1o9DV3bPejCrtaIxvt+g/vRaQYqI67Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp - paho-mqtt + asyncio-mqtt pydantic + tenacity ]; # Module has no tests From 755262e6b6c76c86c4d6ed875e4cc8c1e629ed86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:15:00 +0100 Subject: [PATCH 25/33] python3Packages.zeroconf: 0.47.1 -> 0.47.3 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 9c2b3945642b..c5521f0f0d6b 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.47.1"; + version = "0.47.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA="; + hash = "sha256-hpbJ7kcyM8S2xAaVjuPzHXl/gcAYk3CX7NHxsbZXQ10="; }; nativeBuildInputs = [ From f625263e0ea2ff53c62df1f216862516304a851e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:15:01 +0100 Subject: [PATCH 26/33] python3Packages.zigpy-znp: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index f1b846e9482b..e4d6ddad8de3 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94="; + sha256 = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s="; }; propagatedBuildInputs = [ From bf6996773fe380782375ac1357f6baec493d8f4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 02:15:02 +0100 Subject: [PATCH 27/33] python3Packages.zwave-js-server-python: 0.44.0 -> 0.46.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 3a759b15815e..ca8b65b34137 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.44.0"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4="; + hash = "sha256-EeQ0gUSDsHIJnp1Oc2Imld4ZFa5maX8xj6GzchHlCoc="; }; propagatedBuildInputs = [ From dab946e350e7c14326cb1bff588ccff97d862b70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 00:50:29 +0100 Subject: [PATCH 28/33] python310Packages.python-otbr-api: init at 1.0.5 Co-Authored-By: Martin Weinelt --- .../python-otbr-api/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/python-otbr-api/default.nix diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix new file mode 100644 index 000000000000..11f402cc7a9e --- /dev/null +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, voluptuous +}: + +buildPythonPackage rec { + pname = "python-otbr-api"; + version = "1.0.5"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-yI7TzVJGSWdi+NKZ0CCOi3BC4WIqFuS7YZgihfWDBSY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + cryptography + voluptuous + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "python_otbr_api" + ]; + + meta = with lib; { + description = "Library for the Open Thread Border Router"; + homepage = "https://github.com/home-assistant-libs/python-otbr-api"; + changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79f3233af727..5f05d5378136 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7393,6 +7393,8 @@ self: super: with self; { python-memcached = callPackage ../development/python-modules/python-memcached { }; + python-otbr-api = callPackage ../development/python-modules/python-otbr-api { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; From b703d8e7fba5614449b271059469170811992f8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 18:11:08 +0100 Subject: [PATCH 29/33] python310Packages.nuheat: init at 1.0.1 --- .../python-modules/nuheat/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/nuheat/default.nix diff --git a/pkgs/development/python-modules/nuheat/default.nix b/pkgs/development/python-modules/nuheat/default.nix new file mode 100644 index 000000000000..97607ceab3dc --- /dev/null +++ b/pkgs/development/python-modules/nuheat/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, parameterized +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "nuheat"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "broox"; + repo = "python-nuheat"; + rev = "refs/tags/${version}"; + hash = "sha256-EsPuwILfKc1Bpvu0Qos7yooC3dBaqf46lWhiSZdu3sc="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + mock + parameterized + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "nuheat" + ]; + + meta = with lib; { + description = "Library to interact with NuHeat Signature and Mapei Mapeheat radiant floor thermostats"; + homepage = "https://github.com/broox/python-nuheat"; + changelog = "https://github.com/broox/python-nuheat/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f05d5378136..e63ad2a6fe9e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6536,6 +6536,8 @@ self: super: with self; { Nuitka = callPackage ../development/python-modules/nuitka { }; + nuheat = callPackage ../development/python-modules/nuheat { }; + nulltype = callPackage ../development/python-modules/nulltype { }; num2words = callPackage ../development/python-modules/num2words { }; From c4e8da57f779e0fafd94f40f3105330a0dbf6370 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 02:29:14 +0100 Subject: [PATCH 30/33] home-assistant: 2023.2.5 -> 2023.3.0 https://www.home-assistant.io/blog/2023/03/01/release-20233/ --- .../home-assistant/component-packages.nix | 198 +++++------------- pkgs/servers/home-assistant/default.nix | 58 ++--- pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/patches/ffmpeg-path.patch | 6 +- pkgs/servers/home-assistant/tests.nix | 5 + 5 files changed, 94 insertions(+), 177 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dafb5b4976d2..6111c357490e 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.2.5"; + version = "2023.3.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -70,10 +70,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -200,10 +197,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -355,10 +349,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -378,9 +369,6 @@ bluetooth-data-tools dbus-fast fnvhash - home-assistant-frontend - janus - pillow pyserial pyudev sqlalchemy @@ -398,10 +386,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -420,10 +405,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -492,10 +474,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -811,6 +790,25 @@ ]; "dooya" = ps: with ps; [ ]; + "dormakaba_dkey" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + ifaddr + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: py-dormakaba-dkey "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ @@ -843,6 +841,8 @@ "eafm" = ps: with ps; [ aioeafm ]; + "easyenergy" = ps: with ps; [ + ]; # missing inputs: easyenergy "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ @@ -974,10 +974,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -997,10 +994,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1023,10 +1017,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1074,7 +1065,7 @@ ha-ffmpeg ]; "fibaro" = ps: with ps; [ - fiblary3-fork + pyfibaro ]; "fido" = ps: with ps; [ pyfido @@ -1127,10 +1118,7 @@ esphome-dashboard-api fjaraskupan fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1376,10 +1364,7 @@ esphome-dashboard-api fnvhash govee-ble - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1423,12 +1408,7 @@ ]; "hardkernel" = ps: with ps; [ aiohttp-cors - fnvhash - home-assistant-frontend - janus - pillow psutil-home-assistant - sqlalchemy ]; "hardware" = ps: with ps; [ psutil-home-assistant @@ -1441,11 +1421,6 @@ ]; "hassio" = ps: with ps; [ aiohttp-cors - fnvhash - home-assistant-frontend - janus - pillow - sqlalchemy ]; "havana_shade" = ps: with ps; [ ]; @@ -1514,15 +1489,12 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow pyserial-asyncio pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -1534,8 +1506,6 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow psutil-home-assistant @@ -1543,7 +1513,6 @@ pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -1555,8 +1524,6 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow psutil-home-assistant @@ -1564,7 +1531,6 @@ pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -1598,11 +1564,10 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow + pyroute2 pyserial + python-otbr-api pyudev sqlalchemy zeroconf @@ -1683,11 +1648,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ibeacon-ble ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1744,11 +1706,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr inkbird-ble - janus - pillow pyserial pyudev sqlalchemy @@ -1877,11 +1836,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus kegtron-ble - pillow pyserial pyudev sqlalchemy @@ -1907,10 +1863,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -1930,6 +1883,8 @@ pykmtronic ]; "knx" = ps: with ps; [ + aiohttp-cors + janus xknx ]; "kodi" = ps: with ps; [ @@ -1999,10 +1954,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -2021,11 +1973,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus led-ble - pillow pyserial pyudev sqlalchemy @@ -2233,10 +2182,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -2320,11 +2266,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus moat-ble - pillow pyserial pyudev sqlalchemy @@ -2378,15 +2321,13 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow + mopeka-iot-ble pyserial pyudev sqlalchemy zeroconf - ]; # missing inputs: mopeka_iot_ble + ]; "motion_blinds" = ps: with ps; [ aiohttp-cors fnvhash @@ -2593,7 +2534,8 @@ aio-geojson-nsw-rfs-incidents ]; "nuheat" = ps: with ps; [ - ]; # missing inputs: nuheat + nuheat + ]; "nuki" = ps: with ps; [ pynuki ]; @@ -2638,8 +2580,6 @@ "onboarding" = ps: with ps; [ aiohttp-cors fnvhash - home-assistant-frontend - janus pillow sqlalchemy ]; @@ -2725,11 +2665,8 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus oralb-ble - pillow pyserial pyudev sqlalchemy @@ -2745,11 +2682,12 @@ "otbr" = ps: with ps; [ aiohttp-cors fnvhash - home-assistant-frontend - janus - pillow + ifaddr + pyroute2 + python-otbr-api sqlalchemy - ]; # missing inputs: python-otbr-api + zeroconf + ]; "otp" = ps: with ps; [ pyotp ]; @@ -2940,10 +2878,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev qingping-ble @@ -3004,12 +2939,7 @@ ]; "raspberry_pi" = ps: with ps; [ aiohttp-cors - fnvhash - home-assistant-frontend - janus - pillow psutil-home-assistant - sqlalchemy ]; "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client @@ -3139,9 +3069,6 @@ bluetooth-data-tools dbus-fast fnvhash - home-assistant-frontend - janus - pillow pyserial pyudev sqlalchemy @@ -3159,10 +3086,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev ruuvitag-ble @@ -3260,10 +3184,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3288,10 +3209,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sensorpro-ble @@ -3311,10 +3229,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sensorpush-ble @@ -3362,9 +3277,6 @@ bluetooth-data-tools dbus-fast fnvhash - home-assistant-frontend - janus - pillow pyserial pyudev sqlalchemy @@ -3490,10 +3402,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pysnooz pyudev @@ -3673,10 +3582,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3798,10 +3704,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3823,10 +3726,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3845,6 +3745,13 @@ "thomson" = ps: with ps; [ ]; "thread" = ps: with ps; [ + aiohttp-cors + fnvhash + ifaddr + pyroute2 + python-otbr-api + sqlalchemy + zeroconf ]; "threshold" = ps: with ps; [ ]; @@ -3871,10 +3778,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -3924,6 +3828,9 @@ ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected + "tplink_omada" = ps: with ps; [ + tplink-omada-client + ]; "traccar" = ps: with ps; [ aiohttp-cors pytraccar @@ -4264,10 +4171,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -4303,10 +4207,7 @@ dbus-fast esphome-dashboard-api fnvhash - home-assistant-frontend ifaddr - janus - pillow pyserial pyudev sqlalchemy @@ -4382,15 +4283,12 @@ aiohttp-cors bellows fnvhash - home-assistant-frontend - ifaddr janus pillow pyserial-asyncio pyserial pyudev sqlalchemy - zeroconf zha-quirks zigpy-deconz zigpy-xbee @@ -4804,6 +4702,7 @@ "modern_forms" "mold_indicator" "moon" + "mopeka" "motion_blinds" "motioneye" "mqtt" @@ -4839,6 +4738,7 @@ "notify_events" "notion" "nsw_rural_fire_service_feed" + "nuheat" "nuki" "number" "nut" @@ -4863,6 +4763,7 @@ "openweathermap" "opnsense" "oralb" + "otbr" "overkiz" "ovo_energy" "owntracks" @@ -5053,6 +4954,7 @@ "toon" "totalconnect" "tplink" + "tplink_omada" "traccar" "trace" "tractive" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b5e42fca6ae4..28fc40315f58 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -2,6 +2,7 @@ , lib , callPackage , fetchFromGitHub +, fetchPypi , fetchpatch , python3 , substituteAll @@ -42,16 +43,6 @@ let }; }); - # https://github.com/postlund/pyatv/issues/1879 - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - pname = "aiohttp"; - version = "3.8.1"; - src = self.fetchPypi { - inherit pname version; - hash = "sha256-/FRx4aVN4V73HBvG6+gNTcaB6mAOaL/Ry85AQn8LdXg="; - }; - }); - aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -88,16 +79,6 @@ let }; }); - gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { - version = "4.0.0"; - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "python-gridnet"; - rev = "refs/tags/v${version}"; - hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; - }; - }); - # Pinned due to API changes in 10.0 mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { version = "9.3.0"; @@ -199,6 +180,22 @@ let doCheck = false; }); + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "2.0.4"; + src = super.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-laGOGmryEU29nuTxaK0zBw1jF+Ebr6KNmDzHtYX+kAs="; + }; + nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ + pytest-xdist + ]); + disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ + "test/aaa_profiling" + "test/ext/mypy" + ]; + }); + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -266,7 +263,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.2.5"; + hassVersion = "2023.3.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,18 +276,30 @@ in python.pkgs.buildPythonApplication rec { # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; - # PyPI tarball is missing tests/ directory - src = fetchFromGitHub { + # Primary source is the pypi sdist, because it contains translations + src = fetchPypi { + inherit pname version; + hash = "sha256-JxTvAUKZj59jL1czTBzPD7+6x1K7xGGGwZAO8f8dkzg="; + }; + + # Secondary source is git for tests + gitSrc = fetchFromGitHub { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys="; + hash = "sha256-azH9CnHIY0iOLaF3Iqy+uJ6TuftUs1j4RcpXyRQrQws="; }; nativeBuildInputs = with python3.pkgs; [ setuptools ]; + # copy tests early, so patches apply as they would to the git repo + prePatch = '' + cp --no-preserve=mode --recursive ${gitSrc}/tests ./ + chmod u+x tests/auth/providers/test_command_line_cmd.sh + ''; + # leave this in, so users don't have to constantly update their downstream patch handling patches = [ (substituteAll { @@ -378,6 +387,7 @@ in python.pkgs.buildPythonApplication rec { requests-mock respx stdlib-list + syrupy tomli # required through tests/auth/mfa_modules/test_otp.py pyotp diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index a3b1e7df1a5e..9bdbed311a46 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 = "20230202.0"; + version = "20230301.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Wo3bQnwTDSAC4EhJeYIXx1wODyx3wA2KMMaM3pJEkGw="; + hash = "sha256-2hxP2Wyjkvlje/RnZBtou3Y81d16SYBeAm+JX8hWct4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch index a72674ff7a5f..a4177a35f484 100644 --- a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch +++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -1,8 +1,8 @@ diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py -index 74c826f47d..91f359da2a 100644 +index a98766c78c..1c47bb1f80 100644 --- a/homeassistant/components/ffmpeg/__init__.py +++ b/homeassistant/components/ffmpeg/__init__.py -@@ -40,7 +40,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" +@@ -41,7 +41,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" CONF_EXTRA_ARGUMENTS = "extra_arguments" CONF_OUTPUT = "output" @@ -12,7 +12,7 @@ index 74c826f47d..91f359da2a 100644 CONFIG_SCHEMA = vol.Schema( { diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py -index e1730ffdab..e9cd7934fd 100644 +index 521ac732e5..ab8a56934f 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py @@ -87,7 +87,7 @@ class TestFFmpegSetup: diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 734823e9f475..39e6ab7478d3 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -19,8 +19,10 @@ let homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; + mopeka = [ pyswitchbot ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; + otbr = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; raspberry_pi = [ rpi-bad-power ]; shelly = [ pyswitchbot ]; tilt_ble = [ govee-ble ibeacon-ble ]; @@ -55,6 +57,9 @@ let logbook = [ "--deselect tests/components/logbook/test_websocket_api.py::test_recorder_is_far_behind " ]; + modbus = [ + "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail" + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" From b9d670efc30385acfdda8d739058b7bf263b38b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 03:17:37 +0100 Subject: [PATCH 31/33] python310Packages.homeassistant-stubs: 2023.2.5 -> 2023.3.0 Diff: https://github.com/KapJI/homeassistant-stubs/compare/refs/tags/2023.2.5...2023.3.0 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.3.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 01723e561e19..fd3bed2643d9 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.2.5"; + version = "2023.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-MQYk4DWvmqtPl00L1c00JclKkTZe9EYMrm/LucUHBE0="; + hash = "sha256-svFp3MYj+DIwCT9+/G+lYPRwxGMtJbJQuBD5e+5r0Z4="; }; nativeBuildInputs = [ From 542a704785390e8239b1eb872c276a56473a6f58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 13:39:51 +0100 Subject: [PATCH 32/33] home-assistant-component-tests: Reduce to two parallel test runners MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The component tests are rather short, and each runner has a certain setup cost. So we're better off, just starting fewer of them and have them do more work. It also works around a race condition, that upstream likely isn't running into, because of the hardware specs¹ for the runners. [1] https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources --- pkgs/servers/home-assistant/tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 39e6ab7478d3..182034818e34 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -88,7 +88,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( dontUsePytestXdist = true; pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray - ++ [ "--numprocesses=4" ] + ++ [ "--numprocesses=2" ] ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; From 9e77343b0a6042571b2a1bf32f89169f29219f92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Mar 2023 15:47:46 +0100 Subject: [PATCH 33/33] python310Packages.homeassistant-stubs: Limit support We can only support the stubs on the same version as we build our home-assistant against. --- pkgs/servers/home-assistant/stubs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index fd3bed2643d9..4c8e026b7f11 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , poetry-core , home-assistant +, python }: buildPythonPackage rec { @@ -10,6 +11,8 @@ buildPythonPackage rec { version = "2023.3.0"; format = "pyproject"; + disabled = python.version != home-assistant.python.version; + src = fetchFromGitHub { owner = "KapJI"; repo = "homeassistant-stubs";