From 733a111b84a7c69c551dc714a65f9865a1c7293e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Jan 2025 20:21:25 +0100 Subject: [PATCH 01/12] python312Packages.bleak-esphome: 1.1.1 -> 2.0.0 Diff: https://github.com/bluetooth-devices/bleak-esphome/compare/refs/tags/v1.1.1...v2.0.0 Changelog: https://github.com/bluetooth-devices/bleak-esphome/blob/v2.0.0/CHANGELOG.md --- .../python-modules/bleak-esphome/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index fcfd668844bfc..68e159310ac75 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -9,13 +9,15 @@ lru-dict, poetry-core, pytest-asyncio, + pytest-codspeed, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "bleak-esphome"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,17 +26,12 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${version}"; - hash = "sha256-WFswGtPX0OpDTqT25oHGZ+gIN/fhco4orWeGVXIIfzM="; + hash = "sha256-rN2vpXiOaUjjN6yNZxeEgTpcz0K5soUqKKiDDOhcBtc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bleak_esphome --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ aioesphomeapi bleak bluetooth-data-tools @@ -44,6 +41,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-codspeed + pytest-cov-stub pytestCheckHook ]; From 06f9b95c88cf6084ba502db0025322e7d662035c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jan 2025 09:58:08 +0100 Subject: [PATCH 02/12] python312Packages.demetriek: 1.1.0 -> 1.1.1 Diff: https://github.com/frenck/python-demetriek/compare/refs/tags/v1.1.0...v1.1.1 Changelog: https://github.com/frenck/python-demetriek/releases/tag/v1.1.1 --- pkgs/development/python-modules/demetriek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index b1a7701d9e2fb..4a4a6ebd0c02c 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "demetriek"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-demetriek"; tag = "v${version}"; - hash = "sha256-MDGAhsLbJqvywQntlPfM/cPyltqsqnt2C31ACpMPn0Y="; + hash = "sha256-OTYQFw3Jy+sRGoPYVp5VKgCAzv9Gy2Fn2GjTGdsKjak="; }; postPatch = '' From bc25aa603a2ceda1bc5d4925bc59c70755231008 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jan 2025 22:59:25 +0100 Subject: [PATCH 03/12] python312Packages.habluetooth: 3.6.0 -> 3.7.0 Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/refs/tags/v3.6.0...v3.7.0 Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v3.7.0/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 50e6aef3fb944..6586cb0527229 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -1,8 +1,8 @@ { lib, async-interrupt, - bleak, bleak-retry-connector, + bleak, bluetooth-adapters, bluetooth-auto-recovery, bluetooth-data-tools, @@ -11,6 +11,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-codspeed, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; tag = "v${version}"; - hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M="; + hash = "sha256-wOWQaM1hfWaqLFIzwB7O1yOS/CJPvZ+aGbKzvAE2DAE="; }; build-system = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-codspeed pytest-cov-stub pytestCheckHook ]; From 2e4a79e8a3bcfec8ab915b65a7a62c671252c1ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 14:33:37 +0100 Subject: [PATCH 04/12] python313Packages.powerfox: 1.1.0 -> 1.2.0 https://github.com/klaasnicolaas/python-powerfox/releases/tag/v1.2.0 --- .../python-modules/powerfox/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/powerfox/default.nix b/pkgs/development/python-modules/powerfox/default.nix index 0ca94792b8791..17de893e5d45e 100644 --- a/pkgs/development/python-modules/powerfox/default.nix +++ b/pkgs/development/python-modules/powerfox/default.nix @@ -4,6 +4,7 @@ aresponses, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mashumaro, orjson, poetry-core, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "powerfox"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,9 +27,19 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-powerfox"; tag = "v${version}"; - hash = "sha256-stHZWGkISsemRUModIlE5CqYVVu3Mdt4ksW5tBewEDo="; + hash = "sha256-VSkOCJu3HXBHkvYtSe/kYFOhJ9kMrcf/ijMqvUB9aRU="; }; + patches = [ + # requires poetry-core>=2.0 + (fetchpatch2 { + url = "https://github.com/klaasnicolaas/python-powerfox/commit/e3f1e39573fc278cd2800a2d4f4315cf0aff592b.patch"; + includes = [ "pyproject.toml" ]; + hash = "sha256-hkXLT3IWBVlbAwWvu/erENEsxOuIb8wv9UIVtAZqMPc="; + revert = true; + }) + ]; + build-system = [ poetry-core ]; dependencies = [ From f27e56c14a73357f44478a9dab127d503f40d3b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 14:34:06 +0100 Subject: [PATCH 05/12] python313Packages.pysuez: 1.3.5 -> 2.0.1 https://github.com/jb101010-2/pySuez/releases/tag/2.0.0 https://github.com/jb101010-2/pySuez/releases/tag/2.0.1 --- pkgs/development/python-modules/pysuez/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index 845f9cda0fd28..f27738ca0a7ae 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -4,13 +4,12 @@ fetchFromGitHub, hatchling, aiohttp, - regex, pythonOlder, }: buildPythonPackage rec { pname = "pysuez"; - version = "1.3.5"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,15 +18,12 @@ buildPythonPackage rec { owner = "jb101010-2"; repo = "pySuez"; tag = version; - hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8="; + hash = "sha256-p9kTWaSMRgKZFonHTgT7nj4NdeTFCeEHawIFew/rii4="; }; build-system = [ hatchling ]; - dependencies = [ - aiohttp - regex - ]; + dependencies = [ aiohttp ]; # Module has no tests doCheck = false; @@ -38,7 +34,7 @@ buildPythonPackage rec { description = "Module to get water consumption data from Suez"; mainProgram = "pysuez"; homepage = "https://github.com/jb101010-2/pySuez"; - changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}"; + changelog = "https://github.com/jb101010-2/pySuez/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 5395e70bae3c9e9fd24fa5e76be3096a47a14b33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jan 2025 23:13:03 +0100 Subject: [PATCH 06/12] python312Packages.uiprotect: 7.1.0 -> 7.4.1 Diff: https://github.com/uilibs/uiprotect/compare/refs/tags/v7.1.0...v7.4.1 Changelog: https://github.com/uilibs/uiprotect/blob/refs/tags/v7.4.1/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index fa8b6c395e7d6..8f29d718b83bd 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.1.0"; + version = "7.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-TALjJmTI5lMXyXcJtfyMVpqLo8dBbENG22EX7B+3QKQ="; + hash = "sha256-y4rJoT70WiVS9Gs/U6FPOaGGubPI43x9tA2vcdiDBlw="; }; build-system = [ poetry-core ]; From 18fa8afdc18c7ccad46ba29f4e9cce6ab3e4a0e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 14:43:52 +0100 Subject: [PATCH 07/12] python313Packages.zigpy: 0.73.3 -> 0.74.0 https://github.com/zigpy/zigpy/releases/tag/0.74.0 --- 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 abc1699e12cf6..3d7611c95bb00 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.73.3"; + version = "0.74.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-+YkNV6xbM38dHVpXD264KmzozborvotZRETAncpAUEs="; + hash = "sha256-B0BjDldIzHGRKR79mqgJHbvYeDGY5EDxFKaD2Q+HMyo="; }; postPatch = '' From 2b1c81770a07e2e41fc171e162a15c0c563f7577 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 14:46:19 +0100 Subject: [PATCH 08/12] python313Packages.zha-quirks: 0.0.129 -> 0.0.130 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.130 --- 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 4acc1dbc7b0d4..cb2ba3270dce5 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.129"; + version = "0.0.130"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-/lcF7MZrw85H5LBL8aBdaIuFRT5yJUhr+vN9gJHnPDw="; + hash = "sha256-G5q4W9Dxjhjbkt5rcYhseeaSWC73MJCo/pX/OfNlPrQ="; }; postPatch = '' From 1fecf7b8c15a211a26a1b203bfa172a2f658229b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 14:52:16 +0100 Subject: [PATCH 09/12] python313Packages.zha: 0.0.44 -> 0.0.45 https://github.com/zigpy/zha/releases/tag/0.0.45 --- 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 c94b328ed6463..6e3babb9d9ac7 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.44"; + version = "0.0.45"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-ZgCbhezNsWZsQQViPK04UQA2mGZz47rFiMAk2oR8xR4="; + hash = "sha256-KeHGuQGEoXQnIJKQ86DrsoufN+Ppp/fyYblXx2iGHgU="; }; postPatch = '' From fac1a2418174958623a885e1571a1b27ac6fb19c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 15:06:15 +0100 Subject: [PATCH 10/12] home-assistant: 2025.1.0 -> 2025.1.1 https://github.com/home-assistant/core/releases/tag/2025.1.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 035451a2732cd..ab86d5e31c212 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.1.0"; + version = "2025.1.1"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7005a41f5cfc7..982e396b88dd7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -289,7 +289,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.1.0"; + hassVersion = "2025.1.1"; in python.pkgs.buildPythonApplication rec { @@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tkjOWJ29fvWzto3y6zV8h8yPIGyhC5sBIL5koOsw5i0="; + hash = "sha256-fiGdRXQmH+CcgnGQloktl66Yh8iiFEDCQyOL3jfXjdU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-xaHD93crz4wm3CwX5d/UxeuOQ769G+ZnA26iE7y7hU4="; + hash = "sha256-CYvi2Z1d3hbcfet08TR/jScuOKGgipTEWmno7/r5qLU="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 3551e61b08264..60b22f13295dd 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,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 = "20250103.0"; + version = "20250106.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-i+XOHFGL7UVxL+bNohhi+8pF1kZ5oOY5EpZHR3NbwL4="; + hash = "sha256-Jhbw/HNOInLAihHeP+Vpsvsukjf3OY32EbBayDEuU+k="; }; # there is nothing to strip in this package From 6235631cdae822fe46369ae06ca47dafc80217ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 16:16:01 +0100 Subject: [PATCH 11/12] python313Packages.homeassistant-stubs: 2025.1.0 -> 2025.1.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.1.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 85796e4b15c50..7943fc3137c0b 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.1.0"; + version = "2025.1.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-qKmHQrciezgGPHNNGy7lDM9LaCXJO/DuYIrk8qjWpDQ="; + hash = "sha256-9z8HX9zNzRfMTWJiHwbCpOAmYF9yfHsM/FR9siB7D/E="; }; build-system = [ From f89d9311e1c208a93628d39729f1db085c581e18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jan 2025 16:16:50 +0100 Subject: [PATCH 12/12] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.200 -> 0.13.201 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.201/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 23c821a49738a..3254c7594ca8b 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.200"; + version = "0.13.201"; 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-aZeC003EGa8qBR+sN3EK1EbbwLZqdzNf1bjTQyQ6l9I="; + hash = "sha256-WWfVxLYW5V5q0huBoST3n64Fm9f69rjv8B6g96ZaFDc="; }; build-system = [ setuptools ];