From a70e3d6a839deb6d9acf6d75b94efec02484197f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 17:06:52 +0100 Subject: [PATCH 01/45] python312Packages.deebot-client: 8.4.1 -> 9.1.0 https://github.com/DeebotUniverse/client.py/releases/tag/9.1.0 --- pkgs/development/python-modules/deebot-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 931521c973462..2d7ae545a69b4 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "8.4.1"; + version = "9.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-lOKih1TzZRP4HIGzjmCkALtaz5s/lR2SjjqCnBK0G6Y="; + hash = "sha256-INJE8W3xFx8KdjInN65hBTMoWHZ0agsiePJdqJOOTZI="; }; pythonRelaxDeps = [ From c850c55e8ac65e5d89706bdfcef95d5785338a76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:02:56 +0100 Subject: [PATCH 02/45] python312Packages.uiprotect: 6.4.0 -> 6.6.5 https://github.com/uilibs/uiprotect/blob/refs/tags/v6.6.5/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 9278ad563162a..c20c2b2a624a4 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.4.0"; + version = "6.6.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-+BHxcwQhx4lOqS0ATk1PjLbyTu7xQakM3HMrydXeGUc="; + hash = "sha256-ZohQTXOLc2E0vfD21IUh6ECTfbAd2SZOg/73lk/UMO0="; }; build-system = [ poetry-core ]; @@ -97,6 +97,11 @@ buildPythonPackage rec { "test_bootstrap" ]; + disabledTestPaths = [ + # hangs the test suite + "tests/test_api_ws.py" + ]; + pythonImportsCheck = [ "uiprotect" ]; meta = with lib; { From 7038fcc6dc71631f869a05c6cb863f77469c43ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:19:04 +0100 Subject: [PATCH 03/45] python312Packages.mashumaro: 3.14 -> 3.15 https://github.com/Fatal1ty/mashumaro/releases/tag/v3.15 --- pkgs/development/python-modules/mashumaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 2b28c29da244a..67cf71886726e 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-0THj22KdMvD5O3dNwXKxs2wRIJziPmojLo4BPa3fZ3Y="; + hash = "sha256-Zv2FijxYOLGflJ3bc3udkM3SXgHHzHIeCGHlfybyLGE="; }; build-system = [ setuptools ]; From 887fc9dcb042655ccd090068b54f00643993eaca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:19:35 +0100 Subject: [PATCH 04/45] python312Packages.aiomealie: 0.9.3 -> 0.9.4 https://github.com/joostlek/python-mealie/releases/tag/v0.9.4 --- pkgs/development/python-modules/aiomealie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index ee4ad62a1baff..a795c97e66c42 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-FJhmipWE3DE4PRWkEq8/j9iz9HQ7G7J5I9hwjU6e3FA="; + hash = "sha256-Sl2n78R/twx4+liob4k0B1pskonYD7B00lo9hz45qIs="; }; build-system = [ poetry-core ]; From 6395a2f5bcabff9b0052fc842baf6f101cceb571 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:43:15 +0100 Subject: [PATCH 05/45] python312Packages.bellows: 0.42.0 -> 0.42.2 https://github.com/zigpy/bellows/releases/tag/0.42.2 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index cbfea2399312c..659cae97220d2 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.42.0"; + version = "0.42.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE="; + hash = "sha256-qLTlkdX0nPTUEkVBgzStbYYAi6XpGIfs/KvC/EC8svE="; }; postPatch = '' From bfdf5ea595ba0111468310753be417d530ca805f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:45:30 +0100 Subject: [PATCH 06/45] python312Packages.zigpy: 0.72.0 -> 0.73.1 https://github.com/zigpy/zigpy/releases/tag/0.73.1 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 62055ba30e503..018074851fc42 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.72.0"; + version = "0.73.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-q8YyAFBhY60ZK8tHSJnTU6gbDP3ifT1MAAbpYf3EIJA="; + hash = "sha256-Fb5rZhxd93QY0TYJTTLXEaqlxk3JdlIOun5FB7wJbSE="; }; postPatch = '' From 351da71282b85c66d0ddc58c9391039a56df6fd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:46:39 +0100 Subject: [PATCH 07/45] python312Packages.zha-quirks: 0.0.124 -> 0.0.125 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.125 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 8946613f81b9d..0faa301aaf5c4 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.124"; + version = "0.0.125"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8="; + hash = "sha256-Tqt+ydp7Vr3pWBQ0T5B0CV+bfX+0yRXynEhD01afY/w="; }; postPatch = '' From 143f4645ba6518f7cec66afc0f81cb7dc787a242 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:53:30 +0100 Subject: [PATCH 08/45] python312Packages.zha: 0.0.39 -> 0.0.41 https://github.com/zigpy/zha/releases/tag/0.0.41 --- pkgs/development/python-modules/zha/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index bcece29424119..fee751e560938 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.39"; + version = "0.0.41"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-75R2Ah5L5wjIwGrUeifujiuAo4GhpXbu8EbqAPImjQU="; + hash = "sha256-qtv61rh6qwsjBjUHJ5RWnFWBiPOUW03dRAHO2mq/4II="; }; postPatch = '' @@ -105,11 +105,6 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_cluster_handlers.py" ]; - pytestFlagsArray = [ - "-v" - "--timeout=5" - ]; - meta = with lib; { description = "Zigbee Home Automation"; homepage = "https://github.com/zigpy/zha"; From 4919e4779062c638a89b92b881a04f4e1ed4e525 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 18:54:20 +0100 Subject: [PATCH 09/45] home-assistant-custom-components.dwd: 2024.9.0 -> 2024.11.0 https://github.com/hg1337/homeassistant-dwd/compare/2024.9.0...2024.11.0 --- pkgs/servers/home-assistant/custom-components/dwd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/dwd/package.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix index 5d8cba11f2d78..9968ba73fc357 100644 --- a/pkgs/servers/home-assistant/custom-components/dwd/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dwd/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hg1337"; domain = "dwd"; - version = "2024.9.0"; + version = "2024.11.0"; src = fetchFromGitHub { owner = "hg1337"; repo = "homeassistant-dwd"; rev = version; - hash = "sha256-9zS6ufy7tYt1KwFeqdg0Az8xz3x5UzU9ZO9aOyWjdQE="; + hash = "sha256-v5xSIUW8EMTdLY66yZ31cR/1DWVvn85CfIl/Y4xpXiw="; }; dependencies = [ defusedxml ]; From fe76fc4b00ce452ac883595844ece7831eee3fee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Nov 2024 08:47:36 +0100 Subject: [PATCH 10/45] python312Packages.zeroconf: 0.136.0 -> 0.136.2 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.136.0...0.136.2 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.136.2 --- 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 e9910213140e9..41319b09a3483 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.136.0"; + version = "0.136.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4="; + hash = "sha256-gSoxrG+5LCI0DCEGqrQvzFfnKhlJV5kyqLH6IrN7Zjs="; }; build-system = [ From 98d063273db478b53ebc5529bf2f979673a24397 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 20:30:32 +0100 Subject: [PATCH 11/45] python312Packages.aiostreammagic: 2.8.5 -> 2.10.0 https://github.com/noahhusby/aiostreammagic/releases/tag/2.10.0 --- .../python-modules/aiostreammagic/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix index ce01f37d6c599..3e5ebb220eac8 100644 --- a/pkgs/development/python-modules/aiostreammagic/default.nix +++ b/pkgs/development/python-modules/aiostreammagic/default.nix @@ -1,18 +1,18 @@ { lib, + aiohttp, buildPythonPackage, fetchFromGitHub, mashumaro, orjson, poetry-core, pythonOlder, - websockets, yarl, }: buildPythonPackage rec { pname = "aiostreammagic"; - version = "2.8.5"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,17 +21,15 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiostreammagic"; rev = "refs/tags/${version}"; - hash = "sha256-1/9cpdKRr7O4Ji34OSkbBudSedTAt50oGZBc88XNI18="; + hash = "sha256-CFd8/nyE3hLbmzO/MJEnllIe2MvfD/jkGIpNdYxI8N0="; }; - pythonRelaxDeps = [ "websockets" ]; - build-system = [ poetry-core ]; dependencies = [ + aiohttp mashumaro orjson - websockets yarl ]; From b4a1b86a826820fbf99eee1c31baf401ce936474 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 00:05:12 +0100 Subject: [PATCH 12/45] python312Packages.aioshelly: 12.0.1 -> 12.1.0 https://github.com/home-assistant-libs/aioshelly/releases/tag/12.1.0 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 34f6b0d456772..18402b6043887 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "12.0.1"; + version = "12.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0="; + hash = "sha256-QcVyWabELa1bB2MOwQNPItXLgeOXlFpRh69dS+m1FLI="; }; build-system = [ setuptools ]; From 1413142e97861cca6121a9ac7ff6647cb30454a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 00:48:22 +0100 Subject: [PATCH 13/45] python312Packages.aioswitcher: 4.4.1 -> 5.0.0 https://github.com/TomerFi/aioswitcher/releases/tag/5.0.0 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 08cbff77d200a..f2f3ec34aebfd 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "4.4.1"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; rev = "refs/tags/${version}"; - hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY="; + hash = "sha256-cKHH1yXVm/kZigO1Ub0XZEv+yq4lROc4SGFLqFuwQto="; }; __darwinAllowLocalNetworking = true; From d1bf40992dc333f17ae1b029cfced4fb49f6393d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 00:54:47 +0100 Subject: [PATCH 14/45] python312Packages.amberelectric: 1.1.1 -> 2.0.12 https://github.com/madpilot/amberelectric.py/compare/1.1.1...2.0.12 --- .../python-modules/amberelectric/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix index 5253eef6c2145..b8214fa5372b0 100644 --- a/pkgs/development/python-modules/amberelectric/default.nix +++ b/pkgs/development/python-modules/amberelectric/default.nix @@ -1,31 +1,37 @@ { lib, + aenum, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + poetry-core, + pydantic, pytest-mock, pytestCheckHook, python-dateutil, pythonOlder, - setuptools, urllib3, }: buildPythonPackage rec { pname = "amberelectric"; - version = "1.1.1"; + version = "2.0.12"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-gxpFKIrGHpwjPdF0nnyruwCYf3bhrubdtXNx2+wEiZU="; + src = fetchFromGitHub { + owner = "madpilot"; + repo = "amberelectric.py"; + tag = "v${version}"; + hash = "sha256-HTelfgOucyQINz34hT3kGxhJf68pxKbiO3L54nt5New="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ + aenum urllib3 + pydantic python-dateutil ]; From d27e588be0edd3cbb7f757e91fdec65afedfbe7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 00:58:03 +0100 Subject: [PATCH 15/45] python312Packages.fyta-cli: 0.6.10 -> 0.7.0 https://github.com/dontinelli/fyta_cli/releases/tag/v0.7.0 --- pkgs/development/python-modules/fyta-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index ad3a255e58c0f..f9a6755423324 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fyta-cli"; - version = "0.6.10"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "fyta_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-sPbN6gMPtNzYTYQ5F8w59m5DKobx/TV6v5v8Q9u1rXQ="; + hash = "sha256-OgpQh7WyZynFd308TjIGkQNoy8TFu9gynbDiLueqB/0="; }; build-system = [ hatchling ]; From 1d6656fead534b8352614a63b12c31c1918a91e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 00:59:58 +0100 Subject: [PATCH 16/45] python312Packages.av: 13.0.0 -> 13.1.0 https://github.com/PyAV-Org/PyAV/blob/v13.1.0/CHANGELOG.rst --- pkgs/development/python-modules/av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 249c5af0bec29..6c5c201ba5afc 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "av"; - version = "13.0.0"; + version = "13.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "PyAV-Org"; repo = "PyAV"; rev = "refs/tags/v${version}"; - hash = "sha256-blvtHSUqSl9xAM4t+dFJWmXiOjtnAUC9nicMaUY1zuU="; + hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; }; build-system = [ From 8e12c609d9224e425cf3b9b45d7a0f01814a074a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:15:59 +0100 Subject: [PATCH 17/45] python312Packages.unicode-rbnf: 1.2.0 -> 2.1.0 https://github.com/rhasspy/unicode-rbnf/blob/v2.1.0/CHANGELOG.md --- pkgs/development/python-modules/unicode-rbnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index 7bc806314a725..ce34f9e327917 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "1.2.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; rev = "refs/tags/v${version}"; - hash = "sha256-dAoDO707qmdDzCbi7EWNaM9txdBV46NlLkOs7xyycz0="; + hash = "sha256-1kq8qTzFYYRRjlxBdvIiBuXbprA0bF4zMFOVbpgCR3c="; }; nativeBuildInputs = [ setuptools ]; From 6860096612d0e9e13fedfaa2219ef335df847ff7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:04:48 +0100 Subject: [PATCH 18/45] python312Packages.hassil: 1.7.4 -> 2.0.5 https://github.com/home-assistant/hassil/blob/2.0.5/CHANGELOG.md --- pkgs/development/python-modules/hassil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 30b18f8303663..5fe012e549664 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -17,7 +17,7 @@ let pname = "hassil"; - version = "1.7.4"; + version = "2.0.5"; in buildPythonPackage { inherit pname version; @@ -28,8 +28,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "home-assistant"; repo = "hassil"; - rev = "refs/tags/${version}"; - hash = "sha256-FRP5iVE2KBiHVriWhnYxWFff0y4q2/gC9iO8ZzN3AbI="; + tag = "v${version}"; + hash = "sha256-e6Y0GGURGKzbX1dniBbYEJB9K3/R84n3UmnMO0HPPPo="; }; build-system = [ setuptools ]; From 2e13d4f76cba3c6aac4bd657ee7d451894762377 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:12:33 +0100 Subject: [PATCH 19/45] python312Packages.deebot-client: 9.1.0 -> 9.2.0 https://github.com/DeebotUniverse/client.py/releases/tag/9.2.0 --- pkgs/development/python-modules/deebot-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 2d7ae545a69b4..19771c391496a 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "9.1.0"; + version = "9.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-INJE8W3xFx8KdjInN65hBTMoWHZ0agsiePJdqJOOTZI="; + hash = "sha256-M1O0fSfli/kktfR+RB0pLCiUPriml+NQYbNFa0KZmRE="; }; pythonRelaxDeps = [ From 950b22864f9e14614c7292d09a906956f889e1a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:12:50 +0100 Subject: [PATCH 20/45] python312Packages.elmax-api: 0.0.6.2 -> 0.0.6.3 https://github.com/albertogeniola/elmax-api/releases/tag/v0.0.6.3 --- pkgs/development/python-modules/elmax-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 260ee49538cc7..a8ad21f81a7ee 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.6.2"; + version = "0.0.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-71ewBzAMWncvgXII2VAcbSDwudxqA+MBCl+TCCwTxa4="; + hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg="; }; build-system = [ setuptools ]; From 79b44beb72e7871b8059fcc9a57d08d73a48f561 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:13:23 +0100 Subject: [PATCH 21/45] python312Packages.hdate: 0.10.11 -> 0.11.1 https://github.com/py-libhdate/py-libhdate/releases/tag/v0.11.1 --- pkgs/development/python-modules/hdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 9fe99f93b30e5..ae3cd23b34265 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.11"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "py-libhdate"; repo = "py-libhdate"; rev = "refs/tags/v${version}"; - hash = "sha256-HmdXTvtNiIE2XPFhqs7WpcceEQU7F7RsLFp6/+63yDw="; + hash = "sha256-Il20aKOPQi4J4hWQEMEQOnLdBSHCOu214YE6pxeYbfI="; }; pythonRelaxDeps = [ From 5e402658bb18aa9085415a48b5422705cb24eaf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:19:33 +0100 Subject: [PATCH 22/45] home-assistant.intents: 2024.11.6 -> 2024.12.4 https://github.com/home-assistant/intents/releases/tag/2024.12.4 --- 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 a88446e8acba0..8b53b5d2e4ab4 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.11.6"; + version = "2024.12.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-C2q0mUdA6VGKPHtG2g9Zi0nPvwWP1LAdepJCRkF4ky8="; + hash = "sha256-5mSMezDPJmDaWdL5GeoED3CzjoJRU1CoDZL+6bK7x2Q="; }; build-system = [ From 3b957f011d8ffd8dee6ad9b5b4b2938d89fd6e2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:21:45 +0100 Subject: [PATCH 23/45] python312Packages.plugwise: 1.6.2 -> 1.6.0 https://github.com/plugwise/python-plugwise/releases/tag/v1.6.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 991f52e3d6887..08717a6a1c234 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.6.2"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-rVal/w7ZPKjdCXTeCy6NHDlrCaKDdmJkeusUdW0BRXI="; + hash = "sha256-+pnKcjqS9kIRjC2YRynOqTjTuAXRYOthYWC/CKDqSNc="; }; postPatch = '' From 0203b434db7bc096985d7767d2ceb6dcac6bd466 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:23:38 +0100 Subject: [PATCH 24/45] python312Packages.millheater: 0.12.0 -> 0.12.2 https://github.com/Danielhiversen/pymill/releases/tag/0.12.2 --- pkgs/development/python-modules/millheater/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 7aedc6cd2155e..b36bffd9eedd3 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.12.0"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; - rev = "refs/tags/${version}"; - hash = "sha256-8PrTypJuWNuFz1NZLuyqOpWFsN5OLshj7S10YgcGusQ="; + tag = "012.2"; # https://github.com/Danielhiversen/pymill/issues/87 + hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E="; }; build-system = [ setuptools ]; From 81b32983dd122fa537925b2aa20f85d9a5abf18c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 01:24:18 +0100 Subject: [PATCH 25/45] python312Packages.pydeako: 0.5.4 -> 0.6.0 https://github.com/DeakoLights/pydeako/releases/tag/0.6.0 --- pkgs/development/python-modules/pydeako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix index 6fabf92f5f84b..c386ed1a567ee 100644 --- a/pkgs/development/python-modules/pydeako/default.nix +++ b/pkgs/development/python-modules/pydeako/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeako"; - version = "0.5.4"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "DeakoLights"; repo = "pydeako"; rev = "refs/tags/${version}"; - hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA="; + hash = "sha256-GEYuVKE3DOXJzCqTW2Ngoi6l0e4JvE9lUnZtjrNXTVk="; }; build-system = [ setuptools ]; From 983be0454fe5fcaaeba35f7811e162fc9045d638 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 02:37:50 +0100 Subject: [PATCH 26/45] python312Packages.pysuez: 0.2.2 -> 1.3.2 --- pkgs/development/python-modules/pysuez/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index 8c04887f758c7..51083d78558a7 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -2,15 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, + aiohttp, regex, - requests, pythonOlder, }: buildPythonPackage rec { pname = "pysuez"; - version = "0.2.2"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,15 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jb101010-2"; repo = "pySuez"; - rev = "refs/tags/${version}"; - hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug="; + tag = version; + hash = "sha256-aThZN5Ece9zzEICjLj2HmYoLwDhd7rft3Il3kM73h7M="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ + aiohttp regex - requests ]; # Module has no tests From be31deb9607babf71ddc35c5a6f239ca4c028589 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 16:22:57 +0100 Subject: [PATCH 27/45] python312Packages.python-bsblan: 0.6.4 -> 1.2.1 https://github.com/liudger/python-bsblan/releases/tag/v1.2.1 --- pkgs/development/python-modules/python-bsblan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 42e9abe85c3b1..8c0e521ed18d0 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.6.4"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; rev = "refs/tags/v${version}"; - hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI="; + hash = "sha256-b+/Cy8F2xUsYOr8PGQxkdXD07pAECNmbeWbuysSAT2I="; }; postPatch = '' From 7beb7ce67a641619f96dc7b33f7c6221a9af2efd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 16:24:48 +0100 Subject: [PATCH 28/45] python312Packages.python-homewizard-energy: 6.3.0 -> 7.0.0 https://github.com/homewizard/python-homewizard-energy/releases/tag/v7.0.0 --- .../python-modules/python-homewizard-energy/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index d19187bdc57df..55fa46bdee8bf 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -9,6 +9,7 @@ multidict, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "6.3.0"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DCSBL"; repo = "python-homewizard-energy"; - rev = "refs/tags/v${version}"; - hash = "sha256-etbYZKTNdlQCDc7LXir4D7LtRzYx9jhXZc1bJvsEb8E="; + tag = "v${version}"; + hash = "sha256-HYfp4CSytRl46BWp5hdQFVf9avUwRcy0lqmqRK3lhdo="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; From fc8ab807c0b7e2cd29df73256ec05c45ad189054 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 16:33:48 +0100 Subject: [PATCH 29/45] python312Packages.python-tado: 0.17.6 -> 0.17.7 https://github.com/wmalgadey/PyTado/releases/tag/0.17.7 --- pkgs/development/python-modules/python-tado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 6fb45f4f72828..f9f4eb6e66841 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.17.6"; + version = "0.17.7"; pyproject = true; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE="; + hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk="; }; build-system = [ setuptools ]; From 1be792f7bc30785eda381fb2e7a12bc9b1eef547 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 16:36:13 +0100 Subject: [PATCH 30/45] python312Packages.pytrafikverket: 1.0.0 -> 1.1.1 https://github.com/gjohansson-ST/pytrafikverket/releases/tag/v1.1.1 --- pkgs/development/python-modules/pytrafikverket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index 0af8bb7f59a40..f5c4ecd54e8a1 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "1.0.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qvJbAE5C19RSg5p823sCJ/dWIHBSD4kJrw/p8PF2HkI="; + hash = "sha256-yfo36fAVC2LaresQ1QcXq2EGhGtkVzNbWvD6lynhusQ="; }; build-system = [ poetry-core ]; From 5cea09dbb4dea5d3029f7c5daa29238957812694 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 16:37:37 +0100 Subject: [PATCH 31/45] python312Packages.python-kasa: 0.7.7 -> 0.8.1 https://github.com/python-kasa/python-kasa/blob/0.8.1/CHANGELOG.md --- .../python-modules/python-kasa/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 796b3e601f383..3dd1046f4cae7 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -1,20 +1,20 @@ { lib, aiohttp, - async-timeout, asyncclick, buildPythonPackage, cryptography, fetchFromGitHub, hatchling, kasa-crypt, + mashumaro, orjson, ptpython, - pydantic, pytest-asyncio, pytest-freezer, pytest-mock, pytest-socket, + pytest-xdist, pytestCheckHook, pythonOlder, rich, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.7"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,18 +31,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-kasa"; repo = "python-kasa"; - rev = "refs/tags/${version}"; - hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc="; + tag = version; + hash = "sha256-4P66mFaDg7A9FHqWRUN5NV7nQhMTu3gU+gR2tHWHalU="; }; build-system = [ hatchling ]; dependencies = [ aiohttp - async-timeout asyncclick cryptography - pydantic + mashumaro ]; nativeCheckInputs = [ @@ -50,6 +49,7 @@ buildPythonPackage rec { pytest-freezer pytest-mock pytest-socket + pytest-xdist pytestCheckHook voluptuous ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Skip the examples tests - "kasa/tests/test_readme_examples.py" + "tests/test_readme_examples.py" ]; pythonImportsCheck = [ "kasa" ]; From 4bfed6e8ccfb822eb5a3448c91cca52d223333ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 16:39:51 +0100 Subject: [PATCH 32/45] python312Packages.zwave-js-server-python: 0.58.1 -> 0.59.1 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.59.1 --- .../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 d2caa2c2f383d..b49774b14de1b 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.58.1"; + version = "0.59.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-hszt14ymZQsUg0zfJ7+cY08DlXNaWzxKwV/i4i29DtI="; + hash = "sha256-7TbGRPGIpS8T0bmEIiRHChvdiKqTKccnkl0YVoQHfdE="; }; build-system = [ setuptools ]; From 34d170a59f265f3fced2a85e1508b4c71ff10512 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 04:26:40 +0100 Subject: [PATCH 33/45] python312Packages.music-assistant-models: init at 1.1.3 --- .../music-assistant-models/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/music-assistant-models/default.nix diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix new file mode 100644 index 0000000000000..58e4348622b05 --- /dev/null +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + mashumaro, + orjson, + + # tests + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "music-assistant-models"; + version = "1.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "models"; + rev = "refs/tags/v${version}"; + hash = "sha256-FbnwUfAwCwwBKqEUtb2ZBxHehFwJdr9YkuWKox018BY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0" "${version}" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + mashumaro + orjson + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ + "music_assistant_models" + ]; + + meta = { + description = "Models used by Music Assistant (shared by client and server"; + homepage = "https://github.com/music-assistant/models"; + changelog = "https://github.com/music-assistant/models/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf03bf9774c0e..de2af5e2b6b21 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8503,6 +8503,8 @@ self: super: with self; { muscima = callPackage ../development/python-modules/muscima { }; + music-assistant-models = callPackage ../development/python-modules/music-assistant-models { }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; music-tag = callPackage ../development/python-modules/music-tag { }; From 9258bfa7b596f82ad8df7fc635a6766e729476d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 04:27:04 +0100 Subject: [PATCH 34/45] python312Packages.music-assistant-client: init at 1.0.8 --- .../music-assistant-client/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/music-assistant-client/default.nix diff --git a/pkgs/development/python-modules/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix new file mode 100644 index 0000000000000..e7fbccced4485 --- /dev/null +++ b/pkgs/development/python-modules/music-assistant-client/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + aiohttp, + music-assistant-models, + orjson, + +}: + +buildPythonPackage rec { + pname = "music-assistant-client"; + version = "1.0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "client"; + rev = version; + hash = "sha256-QE2PQeXCAq7+iMomCZK+UmrPUApJxwKi/pzCaLJVS/4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + music-assistant-models + orjson + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "music_assistant_client" + ]; + + meta = { + description = "Python client to interact with the Music Assistant Server API"; + homepage = "https://github.com/music-assistant/client"; + changelog = "https://github.com/music-assistant/client/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de2af5e2b6b21..9b6ff4f7f34f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8503,6 +8503,8 @@ self: super: with self; { muscima = callPackage ../development/python-modules/muscima { }; + music-assistant-client = callPackage ../development/python-modules/music-assistant-client { }; + music-assistant-models = callPackage ../development/python-modules/music-assistant-models { }; musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; From 555314b672f3bb95476bdf734b1089af9d27d14b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 17:49:15 +0100 Subject: [PATCH 35/45] python312Packages.webrtc-models: 0.2.0 -> 0.3.0 https://github.com/home-assistant-libs/python-webrtc-models/releases/tag/0.3.0 --- pkgs/development/python-modules/webrtc-models/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix index 5b2524dc0bc53..1dcb4066deb5e 100644 --- a/pkgs/development/python-modules/webrtc-models/default.nix +++ b/pkgs/development/python-modules/webrtc-models/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "webrtc-models"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-webrtc-models"; rev = "refs/tags/${version}"; - hash = "sha256-6fVcp9kWr5nV4wOKov3ObqyPJo+u3jN443qv++sJ0TQ="; + hash = "sha256-WZPI7vYlfsihskRtrh4XJGx0JSDwn7JIJ8CL3jlryrA="; }; postPatch = '' From 482b66d0aaeea39fccbd8e2fb425df5f55b56327 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 18:10:52 +0100 Subject: [PATCH 36/45] python312Packages.homeassistant-stubs: 2024.11.3 -> 2024.12.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.12.1 --- 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 9dcf47815bb7c..0ad7a19a9fccc 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.11.3"; + version = "2024.12.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-wctoMEduYZxGiSNgZWq4OPgBaiykwTY7FP8PhRsMh0I="; + hash = "sha256-j00wgk4oHZXNAJkosppVXMprDKeqvDMt+aq0MDms1gA="; }; build-system = [ From 37c38e5e2c9dc05061413167f1503b67e7028dfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 18:13:59 +0100 Subject: [PATCH 37/45] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.180 -> 0.13.191 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.191/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index fefbf501f1d22..167b0e023c045 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.180"; + version = "0.13.191"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-OLCGoZ5C39D4yYJagowO914qJlQcJVScm/a1ZbR2alM="; + hash = "sha256-Fm7Sg5u5rkCQFGHnOWimRM4X0EB4xGwY59gdgA1ZFBA="; }; build-system = [ setuptools ]; From c4c07753b9eefa9798c7ea3b209dc2fec434fb8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 18:21:49 +0100 Subject: [PATCH 38/45] home-assistant: 2024.11.3 -> 2024.12.1 https://www.home-assistant.io/blog/2024/12/04/release-202412/ --- .../home-assistant/component-packages.nix | 64 +++++++++++++++---- pkgs/servers/home-assistant/default.nix | 43 +++++++++---- pkgs/servers/home-assistant/frontend.nix | 4 +- .../patches/watchdog5-compat.patch | 13 ++++ .../update-component-packages.py | 2 +- 5 files changed, 99 insertions(+), 27 deletions(-) create mode 100644 pkgs/servers/home-assistant/patches/watchdog5-compat.patch diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index af28371ac6d1a..06c6d5c9bae40 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,38 @@ # Do not edit! { - version = "2024.11.3"; + version = "2024.12.1"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ jaraco-abode ]; + "acaia" = ps: with ps; [ + aioacaia + aioesphomeapi + aioruuvigateway + aioshelly + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + pymicro-vad + pyserial + pyspeex-noise + pyudev + zeroconf + ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -699,7 +724,7 @@ jsonpath ]; "compensation" = ps: with ps; [ - numpy_1 + numpy ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 @@ -800,7 +825,7 @@ home-assistant-intents ifaddr mutagen - numpy_1 + numpy pillow psutil-home-assistant pymicro-vad @@ -2077,7 +2102,7 @@ pyipp ]; "iqvia" = ps: with ps; [ - numpy_1 + numpy pyiqvia ]; "irish_rail_transport" = ps: with ps; [ @@ -2300,12 +2325,13 @@ home-assistant-intents ifaddr mutagen + pylamarzocco pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; # missing inputs: lmcloud + ]; "lametric" = ps: with ps; [ demetriek ]; @@ -2869,6 +2895,9 @@ "mullvad" = ps: with ps; [ mullvad-api ]; + "music_assistant" = ps: with ps; [ + music-assistant-client + ]; "mutesync" = ps: with ps; [ mutesync ]; @@ -2905,6 +2934,8 @@ "nanoleaf" = ps: with ps; [ aionanoleaf ]; + "nasweb" = ps: with ps; [ + ]; # missing inputs: webio-api "neato" = ps: with ps; [ pybotvac ]; @@ -3000,6 +3031,9 @@ "nobo_hub" = ps: with ps; [ pynobo ]; + "nordpool" = ps: with ps; [ + pynordpool + ]; "norway_air" = ps: with ps; [ pymetno ]; @@ -3967,6 +4001,9 @@ "sky_hub" = ps: with ps; [ pyskyqhub ]; + "sky_remote" = ps: with ps; [ + skyboxremote + ]; "skybeacon" = ps: with ps; [ pygatt ] @@ -4178,7 +4215,7 @@ ]; "stream" = ps: with ps; [ av - numpy_1 + numpy pyturbojpeg ]; "streamlabswater" = ps: with ps; [ @@ -4324,8 +4361,7 @@ xmltodict ]; "tedee" = ps: with ps; [ - pytedee-async - ]; + ]; # missing inputs: aiotedee "telegram" = ps: with ps; [ python-telegram-bot ] @@ -4347,7 +4383,7 @@ "template" = ps: with ps; [ ]; "tensorflow" = ps: with ps; [ - numpy_1 + numpy pillow pycocotools tensorflow @@ -4568,7 +4604,7 @@ "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy "trend" = ps: with ps; [ - numpy_1 + numpy ]; "triggercmd" = ps: with ps; [ ]; # missing inputs: triggercmd @@ -4659,7 +4695,7 @@ aio-geojson-usgs-earthquakes ]; "utility_meter" = ps: with ps; [ - croniter + cronsim ]; "uvc" = ps: with ps; [ uvcclient @@ -5062,6 +5098,7 @@ # components listed in tests/components for which all dependencies are packaged supportedComponentsWithTests = [ "abode" + "acaia" "accuweather" "acmeda" "adax" @@ -5457,6 +5494,7 @@ "kostal_plenticore" "kraken" "kulersky" + "lamarzocco" "lametric" "landisgyr_heat_meter" "lastfm" @@ -5549,6 +5587,7 @@ "mqtt_room" "mqtt_statestream" "mullvad" + "music_assistant" "mutesync" "my" "myq" @@ -5578,6 +5617,7 @@ "nmap_tracker" "no_ip" "nobo_hub" + "nordpool" "notify" "notify_events" "notion" @@ -5741,6 +5781,7 @@ "simplisafe" "simulated" "siren" + "sky_remote" "skybell" "slack" "sleepiq" @@ -5815,7 +5856,6 @@ "tautulli" "tcp" "technove" - "tedee" "telegram" "telegram_bot" "tellduslive" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f1fa3e4920cc2..37e8419beeb5e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -161,15 +161,6 @@ let doCheck = false; # no tests }); - plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec { - version = "1.4.4"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-dlDytOSp/7npanxXH5uaDv29AP21UciEzIzDlMf6jf8="; - }; - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -235,6 +226,21 @@ let }; }); + pylamarzocco = super.pylamarzocco.overridePythonAttrs (oldAttrs: rec { + version = "1.2.12"; + src = fetchFromGitHub { + owner = "zweckj"; + repo = "pylamarzocco"; + tag = "v${version}"; + hash = "sha256-h3Oh1y1tirOWh3I8piybLZfTKwyGk0zJJ6XmHvmbUW0="; + }; + dependencies = with self; [ + bleak + httpx + websockets + ]; + }); + pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { version = "3.6.9"; src = fetchFromGitHub { @@ -264,6 +270,16 @@ let }; }); + python-linkplay = super.python-linkplay.overridePythonAttrs (oldAttrs: rec { + version = "0.0.20"; + src = fetchFromGitHub { + owner = "Velleman"; + repo = "python-linkplay"; + tag = "v${version}"; + hash = "sha256-UIWubFLHtf43co/aYXh3rxkjLJ77E+Sgkx25UFC5vcg="; + }; + }); + # newer versions require pydantic>=2 python-on-whales = super.python-on-whales.overridePythonAttrs (oldAttrs: rec { version = "0.72.0"; @@ -441,7 +457,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.11.3"; + hassVersion = "2024.12.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -459,13 +475,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-9b4HPSCPYUUwKxn0JBw5uN6nI97jvgqBHFRUNhDue/k="; + hash = "sha256-Gmm8PfgxJYlTEGYKcteSMFbxDWFqmZ/Gt0qbuMe7oHg="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-W7Z6C3kMyEIkY/3zQHm1OMMN7Tuj3ThsubLo6KjVotw="; + hash = "sha256-oQ53syzdVjd8HiO83YloDczDXDweZY4muAFB4HR8SJQ="; }; build-system = with python.pkgs; [ @@ -509,6 +525,8 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getExe ffmpeg-headless}"; }) + + ./patches/watchdog5-compat.patch ]; postPatch = '' @@ -551,6 +569,7 @@ in python.pkgs.buildPythonApplication rec { python-slugify pyyaml requests + securetar sqlalchemy typing-extensions ulid-transform diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 53bc67e531795..4ae543ec08aa1 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 = "20241106.2"; + version = "20241127.6"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-9Il9/lHKIaymw7H8fL1gpp80+VzSqVJ1IyHGEa3OoO8="; + hash = "sha256-wNIkAuedlgHO05rGnxJHFOH2W5eQ45yGWK+tjLRLERo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/watchdog5-compat.patch b/pkgs/servers/home-assistant/patches/watchdog5-compat.patch new file mode 100644 index 0000000000000..d4e27769579bc --- /dev/null +++ b/pkgs/servers/home-assistant/patches/watchdog5-compat.patch @@ -0,0 +1,13 @@ +diff --git a/homeassistant/components/folder_watcher/__init__.py b/homeassistant/components/folder_watcher/__init__.py +index 3aeaa6f7ef2..f5c2db513b7 100644 +--- a/homeassistant/components/folder_watcher/__init__.py ++++ b/homeassistant/components/folder_watcher/__init__.py +@@ -68,7 +68,7 @@ class EventHandler(PatternMatchingEventHandler): + + def __init__(self, patterns: list[str], hass: HomeAssistant, entry_id: str) -> None: + """Initialise the EventHandler.""" +- super().__init__(patterns) ++ super().__init__(patterns=patterns) + self.hass = hass + self.entry_id = entry_id + diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 5d8dbacd91bc2..088a04283de8f 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -42,7 +42,7 @@ "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "HAP-python": "hap-python", "ha-av": "av", - "numpy": "numpy_1", + "numpy": "numpy", "ollama-hass": "ollama", "paho-mqtt": "paho-mqtt_1", "pysuezV2": "pysuez", From 548fa4056bbaec9ee5737f482abf1d1af68b78ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Dec 2024 19:34:12 +0100 Subject: [PATCH 39/45] python313Packages.pyzipper: disable tests They depend on a removed standard library module. --- pkgs/development/python-modules/pyzipper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyzipper/default.nix b/pkgs/development/python-modules/pyzipper/default.nix index 8112958b10c35..e292972d26d4a 100644 --- a/pkgs/development/python-modules/pyzipper/default.nix +++ b/pkgs/development/python-modules/pyzipper/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyzipper" ]; + doCheck = pythonOlder "3.13"; # depends on removed nntplib battery + disabledTests = [ # Tests are parsing CLI output "test_args_from_interpreter_flags" From 0ca4b5979fbfd1b50a509495bd0bc96eb23d26f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Dec 2024 17:14:58 +0100 Subject: [PATCH 40/45] zwave-js-server: 1.38.0 -> 1.40.2 https://github.com/zwave-js/zwave-js-server/releases/tag/1.40.2 --- pkgs/by-name/zw/zwave-js-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix index 711ce58bb3eac..4786d1486e364 100644 --- a/pkgs/by-name/zw/zwave-js-server/package.nix +++ b/pkgs/by-name/zw/zwave-js-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "zwave-js-server"; - version = "1.38.0"; + version = "1.40.2"; src = fetchFromGitHub { owner = "zwave-js"; repo = pname; rev = version; - hash = "sha256-rAm/IPTnMUkwU/7Jzr0OEUDoKiUWxxEKZ21FxQW8sY8="; + hash = "sha256-+S6sMJKmvi5P7eDEWtimArY1W/5IABl/cZkTqhDORgc="; }; - npmDepsHash = "sha256-7dlXppXCmryxq90QI0Lq3CE6BUHSogTHmHBMCbkZWT0="; + npmDepsHash = "sha256-HfxYR62r0D0LTmj4Lb+dCvD4tdpE8b7nmk5wki7vEM8="; # For some reason the zwave-js dependency is in devDependencies npmFlags = [ "--include=dev" ]; From 77fe93ecfd12d4b5dedd8cfe249f8e06f682eaed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Dec 2024 23:48:44 +0100 Subject: [PATCH 41/45] python313Packages.pyatv: drop mediafile dependendcy This was not needed anymore since 0.16.0 and blocks Python 3.13 support. --- pkgs/development/python-modules/pyatv/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 43432a2d1428d..649b751bea4a4 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -8,7 +8,6 @@ deepdiff, fetchFromGitHub, ifaddr, - mediafile, miniaudio, protobuf, pydantic, @@ -19,7 +18,6 @@ pytest-timeout, pytestCheckHook, pythonAtLeast, - pythonOlder, requests, setuptools, srptools, @@ -34,8 +32,6 @@ buildPythonPackage rec { version = "0.16.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "postlund"; repo = "pyatv"; @@ -55,7 +51,6 @@ buildPythonPackage rec { "chacha20poly1305-reuseable" "cryptography" "ifaddr" - "mediafile" "miniaudio" "protobuf" "requests" @@ -71,7 +66,6 @@ buildPythonPackage rec { chacha20poly1305-reuseable cryptography ifaddr - mediafile miniaudio protobuf pydantic From e892f6e3c70a3c81b6314787ddf5c87076bc631a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Dec 2024 00:06:31 +0100 Subject: [PATCH 42/45] python312Packages.aioelectricitymaps: update test snapshots --- pkgs/development/python-modules/aioelectricitymaps/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index b02c3eed7f0fd..4d75deb113154 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -51,6 +51,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioelectricitymaps" ]; + # https://github.com/jpbede/aioelectricitymaps/pull/415 + pytestFlagsArray = [ "--snapshot-update" ]; + meta = with lib; { description = "Module for interacting with Electricity maps"; homepage = "https://github.com/jpbede/aioelectricitymaps"; From bc886bdb46ff238445cbb552550780bdd7894d0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Dec 2024 02:54:08 +0100 Subject: [PATCH 43/45] python312Packages.dulwich: 0.22.5 -> 0.22.6 https://github.com/jelmer/dulwich/releases/tag/v0.22.6 --- .../python-modules/dulwich/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 752a09be221e5..8212e105eb359 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fastimport, fetchFromGitHub, - fetchpatch2, gevent, geventhttpclient, git, @@ -12,7 +11,7 @@ gnupg, gpgme, paramiko, - unittestCheckHook, + pytestCheckHook, pythonOlder, setuptools, setuptools-rust, @@ -20,17 +19,17 @@ }: buildPythonPackage rec { - version = "0.22.5"; pname = "dulwich"; - format = "setuptools"; + version = "0.22.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jelmer"; repo = "dulwich"; - rev = "refs/tags/dulwich-${version}"; - hash = "sha256-/YqC7y8PU+H2qjPqqzdw6iSSSElK709izLTcs9qbt1I="; + tag = "v${version}"; + hash = "sha256-sE5du5Nv2AOyiBpQ2hDJss1dVSVBzWypnGWk3/hI8UI="; }; build-system = [ @@ -58,17 +57,21 @@ buildPythonPackage rec { geventhttpclient git glibcLocales - unittestCheckHook + pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - preCheck = '' - # requires swift config file - rm tests/contrib/test_swift_smoke.py + pytestFlagsArray = [ "tests" ]; + + disabledTests = [ + # AssertionError: 'C:\\\\foo.bar\\\\baz' != 'C:\\foo.bar\\baz' + "test_file_win" + ]; - # ImportError: attempted relative import beyond top-level package - rm tests/test_greenthreads.py - ''; + disabledTestPaths = [ + # requires swift config file + "tests/contrib/test_swift_smoke.py" + ]; doCheck = !stdenv.hostPlatform.isDarwin; From c48ff9350fc012f2615c48b6d2bf76b3999b8eda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Dec 2024 03:20:22 +0100 Subject: [PATCH 44/45] python312Packages.google-nest-sdm: disable failing test --- pkgs/development/python-modules/google-nest-sdm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index c03a2d944d562..003049ab525a2 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -55,6 +55,8 @@ buildPythonPackage rec { disabledTests = [ "test_clip_preview_transcode" "test_event_manager_event_expiration_with_transcode" + # AssertionError: assert '12345' == 12345 + "test_info_traits_type_error" ]; meta = with lib; { From 792c9212a41014c4dd058a36e7f5e2b58018dc9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Dec 2024 03:44:20 +0100 Subject: [PATCH 45/45] python312Packages.trio-asyncio: disable failing tests --- pkgs/development/python-modules/trio-asyncio/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 821cd770caaff..980ba19ace82a 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -49,6 +49,13 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; + disabledTests = [ + # TypeError: RaisesGroup.__init__() got an unexpected keyword argument 'strict' + # https://github.com/python-trio/trio-asyncio/issues/154 + "test_run_trio_task_errors" + "test_cancel_loop_with_tasks" + ]; + nativeCheckInputs = [ pytest-trio pytestCheckHook