From 2dc8bd63e5b32fa3f404bf6f26015fb4584b70bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Feb 2024 02:52:33 +0100 Subject: [PATCH 1/5] python311Packages.roombapy: 1.6.10 -> 1.6.13 https://github.com/pschmitt/roombapy/releases/tag/1.6.11 https://github.com/pschmitt/roombapy/releases/tag/1.6.12 https://github.com/pschmitt/roombapy/releases/tag/1.6.13 --- .../python-modules/roombapy/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 02fdef0c54b0..bef8114aa3cf 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -5,41 +5,40 @@ , orjson , paho-mqtt , poetry-core +, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.10"; - format = "pyproject"; + version = "1.6.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-aGNSySSKCx/8GYUdDWMSAhMBex738UACqnqj/Qx1m38="; + hash = "sha256-5TFuOk3fj4kg5MyWz7HQ/zWdvceFa3mWnFx+Yuq2III="; }; - postPatch = '' - # hbmqtt was replaced by amqtt - substituteInPlace tests/test_roomba_integration.py \ - --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" - - substituteInPlace pyproject.toml \ - --replace 'orjson = ">=3.8.7"' 'orjson = "*"' - ''; - nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "orjson" ]; propagatedBuildInputs = [ orjson paho-mqtt + pydantic ]; nativeCheckInputs = [ From 2213bf64c63e91aac8a4d271f0cd1d03ebc56465 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Feb 2024 02:53:02 +0100 Subject: [PATCH 2/5] home-assistant: 2024.2.2 -> 2024.2.3 https://github.com/home-assistant/core/releases/tag/2024.2.3 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 31 +++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5e4754d36d18..d29d16a819fc 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 = "2024.2.2"; + version = "2024.2.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 182cfe1bd59b..0d1a69767793 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -140,6 +140,21 @@ let ]; }); + brother = super.brother.overridePythonAttrs (oldAttrs: rec { + version = "3.0.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-rRzcWT9DcNTBUYxyYYC7WORBbrkgj0toCp2e8ADUN5s="; + }; + }); + + debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { + # tests are deadlocking too often + # https://github.com/NixOS/nixpkgs/issues/262000 + doCheck = false; + }); + geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -374,6 +389,16 @@ let }; }); + wyoming = super.wyoming.overridePythonAttrs (oldAttrs: rec { + version = "1.5.2"; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming"; + rev = "refs/tags/${version}"; + hash = "sha256-2bc5coKL5KlTeL9fdghPmRF66NXfimHOKGtE2yPXgrA="; + }; + }); + xbox-webapi = super.xbox-webapi.overridePythonAttrs (oldAttrs: rec { version = "2.0.11"; src = fetchFromGitHub { @@ -428,7 +453,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.2.2"; + hassVersion = "2024.2.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -446,13 +471,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-nzx1ZaIBjzA2cgCkSlRLCr2Xd51i6kBHSKnfGgt9RpQ="; + hash = "sha256-di9KdglYg+bzGvjGKgNbGRfH1tu96o82WzRUIaAejik="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-ITwY3cB5YFmY1qTXBHpulEULdF0yKme334wxQVULvW8="; + hash = "sha256-iCcDuQb+l6+SV+E9dPtKlU3v94Q9On75csT5STMdqVo="; }; nativeBuildInputs = with python.pkgs; [ From 108db102e657f9de390ecd86b6aa183a9936bd46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Feb 2024 03:49:11 +0100 Subject: [PATCH 3/5] python311Packages.homeassistant-stubs: 2024.2.2 -> 2024.2.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.2.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 5699b3c556f2..3489e4ccc05f 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.2.2"; + version = "2024.2.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-RL3lgeaJO721VOlhLAeOM8wlKMouLQVbYnPsAeOZGxM="; + hash = "sha256-kBr9NaP1FBTMBloAXEpx4s4iMe1T45i7Gui1aULQPXg="; }; nativeBuildInputs = [ From 5bee21fb753ff25faca985dac1d9cf7fede4560c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Feb 2024 01:26:05 +0100 Subject: [PATCH 4/5] python311Packages.xknx: use pytest-asyncio_0_21 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 91721fdd169a..99feb4a0cb51 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cryptography , ifaddr -, pytest-asyncio +, pytest-asyncio_0_21 , pytestCheckHook , pythonOlder , setuptools @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0_21 pytestCheckHook ]; From c0f2fc1eb8eea76489f9bc781313c74a46c17f02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Feb 2024 01:46:58 +0100 Subject: [PATCH 5/5] python311Packages.pydiscovergy: relax pytz constraint --- pkgs/development/python-modules/pydiscovergy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index 3c87b6b6f3a1..dd51f1b964dc 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -9,6 +9,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , respx }: @@ -29,6 +30,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pytz" ]; propagatedBuildInputs = [