From c81ebe69efa15183ae115e60c1c7b698cecdeec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Apr 2025 22:33:06 -0700 Subject: [PATCH 01/12] python313Packages.bellows: 0.44.0 -> 0.44.1 Diff: https://github.com/zigpy/bellows/compare/refs/tags/0.44.0...0.44.1 Changelog: https://github.com/zigpy/bellows/releases/tag/0.44.1 --- pkgs/development/python-modules/bellows/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 301f22512cf8..9bbbc35c7fcc 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -5,8 +5,6 @@ click, click-log, fetchFromGitHub, - pure-pcapy3, - pyserial-asyncio, pytest-asyncio, pytest-timeout, pytestCheckHook, @@ -18,16 +16,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.44.0"; + version = "0.44.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; tag = version; - hash = "sha256-9CuZGorTqay09ZHrUDoorYew8vvDV6pyxMuik7/QKJ4="; + hash = "sha256-LxwKS4jh/ehYGxhU4lpmzXBWGacLtjq6c/lhBybLaRE="; }; postPatch = '' @@ -41,8 +37,6 @@ buildPythonPackage rec { dependencies = [ click click-log - pure-pcapy3 - pyserial-asyncio voluptuous zigpy ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; @@ -58,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; - changelog = "https://github.com/zigpy/bellows/releases/tag/${version}"; + changelog = "https://github.com/zigpy/bellows/releases/tag/${src.tag}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; mainProgram = "bellows"; From c583191be7aa8affb736b16dfa334d717b0c26b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Apr 2025 22:34:04 -0700 Subject: [PATCH 02/12] python313Packages.zha: 0.0.55 -> 0.0.56 Diff: https://github.com/zigpy/zha/compare/refs/tags/0.0.55...0.0.56 Changelog: https://github.com/zigpy/zha/releases/tag/0.0.56 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 527283d544f3..374c903ffbb3 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.55"; + version = "0.0.56"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-LiHJk7xVdIqNl6BTfwlch3jqQm/MvbrKSExhOR5KD0c="; + hash = "sha256-k6Zegn7YUw5Wueb/8Z1RJ7teRMQ6Owdm8obM6XHI/aY="; }; postPatch = '' From 708cdac2737b6bdb5ab50d4e84af830ad042b610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Apr 2025 22:33:50 -0700 Subject: [PATCH 03/12] python313Packages.zigpy: 0.78.0 -> 0.78.1 Diff: https://github.com/zigpy/zigpy/compare/refs/tags/0.78.0...0.78.1 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.78.1 --- .../python-modules/zigpy/default.nix | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index a9b9fde8ec90..dad6edf4dc1f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -12,9 +12,7 @@ fetchFromGitHub, freezegun, frozendict, - importlib-resources, jsonschema, - pycryptodome, pyserial-asyncio, pytest-asyncio, pytest-timeout, @@ -27,16 +25,14 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.78.0"; + version = "0.78.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-7ckpg1ukuASWtTdQn/P0KfXaMo5l2NyB9alCXeTarEU="; + hash = "sha256-b+4KqcswAKUNJb4e450VwmAR0mca9ApW4n+kif7BR7o="; }; postPatch = '' @@ -47,22 +43,18 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - [ - attrs - aiohttp - aiosqlite - crccheck - cryptography - frozendict - jsonschema - pyserial-asyncio - typing-extensions - pycryptodome - voluptuous - ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + dependencies = [ + attrs + aiohttp + aiosqlite + crccheck + cryptography + frozendict + jsonschema + pyserial-asyncio + typing-extensions + voluptuous + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; nativeCheckInputs = [ aioresponses From b9a395baeb69231b43abec34feded34b707cf919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Apr 2025 22:30:33 -0700 Subject: [PATCH 04/12] home-assistant: 2025.4.2 -> 2025.4.3 Diff: https://github.com/home-assistant/core/compare/refs/tags/2025.4.2...2025.4.3 Changelog: https://github.com/home-assistant/core/releases/tag/2025.4.3 Co-Authored-By: Martin Weinelt --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/tests.nix | 14 +++++++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 81d31a96bdf2..eb021ce9cab5 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 = "2025.4.2"; + version = "2025.4.3"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c401f0a9bbaa..c526ac3a9418 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -377,7 +377,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.4.2"; + hassVersion = "2025.4.3"; in python.pkgs.buildPythonApplication rec { @@ -398,13 +398,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-7OwkZ2KF1IxSNCXvr7Ex0nIKWWr78Zvma2WGaKM5cJE="; + hash = "sha256-KyPWEGXSoB9BJolR4+Kq9K9urhXN4YcgV0SQYaAEjiA="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-IBJxyPZgFrCiARgOzYEcC6Eu/hwoOFTH87lkb+6UYJ4="; + hash = "sha256-xo1f2GDeafOaXiJ1+l+NsJkpU0FvbSnflsp2BE/JKC4="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 9660ad0f6424..2c3ab38831ea 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -14,7 +14,7 @@ let ibeacon-ble ]; hassio = getComponentDeps "homeassistant_yellow"; - homeassistant_hardware = getComponentDeps "zha"; + homeassistant_hardware = getComponentDeps "otbr" ++ getComponentDeps "zha"; homeassistant_sky_connect = getComponentDeps "zha"; homeassistant_yellow = getComponentDeps "zha"; husqvarna_automower_ble = getComponentDeps "gardena_bluetooth"; @@ -78,6 +78,14 @@ let }; extraPytestFlagsArray = { + backup = [ + # outdated snapshot + "--deselect tests/components/backup/test_sensors.py::test_sensors" + ]; + bmw_connected_drive = [ + # outdated snapshot + "--deselect tests/components/bmw_connected_drive/test_select.py::test_entity_state_attrs" + ]; dnsip = [ # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" @@ -88,6 +96,10 @@ let "--deselect tests/components/jellyfin/test_media_source.py::test_audio_codec_resolve" "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; + matter = [ + # outdated snapshot in eve_weather_sensor variant + "--deselect tests/components/matter/test_number.py::test_numbers" + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" From e4e72f0b7849599d77a3e780e89b91f9e75ad5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Apr 2025 22:36:04 -0700 Subject: [PATCH 05/12] python313Packages.homeassistant-stubs: 2025.4.2 -> 2025.4.3 Diff: https://github.com/KapJI/homeassistant-stubs/compare/refs/tags/2025.4.2...2025.4.3 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.4.3 --- 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 9f8475721a76..6244ed72f939 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.4.2"; + version = "2025.4.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-SFMGBPVjgoLkPlYHuTKZLbhTMbKGEeE1wYsFJ0ssbgg="; + hash = "sha256-IvtkEZLVngSHNb0nGJri/EW1t29KcrFvxdm6gjmrtz4="; }; build-system = [ From 19254bd10a1e3ba028e983a285be38958eb6b0bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Apr 2025 15:39:23 +0200 Subject: [PATCH 06/12] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.233 -> 0.13.235 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.235/CHANGELOG.md --- .../pytest-homeassistant-custom-component.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index fafad5d28d6a..b7fcf1de9ff2 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.233"; + version = "0.13.235"; pyproject = true; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.13"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-Yi865ZCK1Rr9Nto0HpqRqwCE6t/UPLR8lqfPv0P+bcs="; + hash = "sha256-hr9GZsyXj7ewEevyXs2PCMKFQahcco+gVFQi8kSxf9A="; }; build-system = [ setuptools ]; From 868a66523e8fd6c5f3f88c2d15fdb0b2ad6d623e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Apr 2025 17:09:55 +0200 Subject: [PATCH 07/12] python313Packages.env-canada: fix the 0.10.1 update The update did not bump the src fod hahs. --- pkgs/development/python-modules/env-canada/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 69705997f4f9..00f2fc0a9055 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -3,6 +3,7 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + freezegun, geopy, imageio, lxml, @@ -13,6 +14,7 @@ python-dateutil, pythonOlder, setuptools, + syrupy, voluptuous, }: @@ -27,7 +29,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; tag = version; - hash = "sha256-4PztYdQmMH2n3dlV8arJ2UFGp08nkIK80L460UdNhV8="; + hash = "sha256-YDosRPROWpjG27MyCErCTvP99mAlzg/GfmU73cBVUTo="; }; build-system = [ setuptools ]; @@ -44,7 +46,11 @@ buildPythonPackage rec { voluptuous ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + freezegun + pytestCheckHook + syrupy + ]; disabledTests = [ # Tests require network access From 85c407678c5659c52930750487c3361fd3816687 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Apr 2025 00:51:42 +0200 Subject: [PATCH 08/12] home-assistant-custom-components.daikin_onecta: 4.2.3 -> 4.2.6 https://github.com/jwillemsen/daikin_onecta/tag/v4.2.6 --- .../custom-components/daikin_onecta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index be9ae7010515..a3e7f431134a 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.2.3"; + version = "4.2.6"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-ylVHgmE6zDLE73KpuIag0iUx77w6ujp3cF/+x2bJiA8="; + hash = "sha256-JBo2205wHeC+5+kontzqgRLTss2Naht/TbkuEAs2nSQ="; }; meta = { From 9da85435932708b0eeebddd30aef94e6f7427795 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Apr 2025 00:53:50 +0200 Subject: [PATCH 09/12] home-assistant-custom-components.midea_ac: 2025.3.1 -> 2025.4.0 https://github.com/mill1000/midea-ac-py/compare/refs/tags/2025.3.1...refs/tags/2025.4.0 --- .../home-assistant/custom-components/midea_ac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index 9befc39ade5e..848ff9370fc6 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "mill1000"; domain = "midea_ac"; - version = "2025.3.1"; + version = "2025.4.0"; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-ac-py"; tag = version; - hash = "sha256-oO+t0my72PwWWUAzr8blA3Q8uJyICZNcfoOHsLFL3MQ="; + hash = "sha256-ZkLC0GhfN+jp1DWv30LNVCP+NEZywt9Pxycs2RWBzrM="; }; dependencies = [ msmart-ng ]; From a9f46ccba955f51ecef80b147b9311797b8c1c15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Apr 2025 00:54:18 +0200 Subject: [PATCH 10/12] home-assistant-custom-components.moonraker: 1.7.0 -> 1.7.1 https://github.com/marcolivierarsenault/moonraker-home-assistant/releases/tag/1.7.1 --- .../home-assistant/custom-components/moonraker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 2934a25d1b6b..ec21ff0f6b57 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; tag = version; - hash = "sha256-J/MHT+yzV08sJMJCDoH6tpE86Mgz4fxpgbyWNge0n54="; + hash = "sha256-BPlHMTGb1xSxFydeLsHKBlXSqgh1qmTrenPo+XPx2IM="; }; dependencies = [ From b3d615feca13e827de85e8ad929ee8c3f70f5804 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Apr 2025 00:55:27 +0200 Subject: [PATCH 11/12] home-assistant-custom-components.tuya_local: 2025.3.0 -> 2025.4.0 https://github.com/make-all/tuya-local/releases/tag/2025.4.0 --- .../home-assistant/custom-components/tuya_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index 5bcb72bda07c..d1998fc8bf20 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2025.3.0"; + version = "2025.4.0"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; tag = version; - hash = "sha256-CkH2Njv9qdGlnEo3RP64Lz4ys62W6DxYC/TSl/lndPI="; + hash = "sha256-lvDiB/kVlPsKI28muv03B8j/0RD7U4I4ZNiucji8/e4="; }; dependencies = [ From 12a35c2c1559b8469485b88fc2176856beb36121 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Apr 2025 00:55:57 +0200 Subject: [PATCH 12/12] home-assistant-custom-components.xiaomi_miot: 1.0.16 -> 1.0.17 https://github.com/al-one/hass-xiaomi-miot/releases/tag/v1.0.17 --- .../home-assistant/custom-components/xiaomi_miot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index d94ffcb7b480..a251d82fd730 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-wsc1XSq1KYq7Rs99XK/wL2PYWrxbMblWPHzgopeQ5IM="; + hash = "sha256-jiskzH2MsddF1rdCnrdJyALQQxFrFUBpOjdR/zbTxh0="; }; dependencies = [