From eab16a708092851b6edcb0b630f16a34ce30950e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 23:13:31 +0100 Subject: [PATCH] home-assistant: 2022.12.9 -> 2023.1.0 https://www.home-assistant.io/blog/2023/01/04/release-20231/ --- .../home-assistant/component-packages.nix | 38 +++++++++++++------ pkgs/servers/home-assistant/default.nix | 17 ++------- pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/parse-requirements.py | 2 +- pkgs/servers/home-assistant/tests.nix | 1 + 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 26f643fcaf30..dee4a13077ac 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 = "2022.12.9"; + version = "2023.1.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -79,6 +79,9 @@ "airvisual" = ps: with ps; [ pyairvisual ]; + "airvisual_pro" = ps: with ps; [ + pyairvisual + ]; "airzone" = ps: with ps; [ aioairzone ]; @@ -657,9 +660,6 @@ ]; "derivative" = ps: with ps; [ ]; - "deutsche_bahn" = ps: with ps; [ - schiene - ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ @@ -728,6 +728,7 @@ aiohttp-cors async-upnp-client fnvhash + getmac ifaddr sqlalchemy zeroconf @@ -1147,7 +1148,7 @@ "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ - garages-amsterdam + odp-amsterdam ]; "gaviota" = ps: with ps; [ ]; @@ -1229,6 +1230,11 @@ pyturbojpeg aiohttp-cors ]; + "google_assistant_sdk" = ps: with ps; [ + aiohttp-cors + fnvhash + sqlalchemy + ]; # missing inputs: gassist-text "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -1459,12 +1465,12 @@ zigpy ]; "homekit" = ps: with ps; [ + hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash - hap-python ha-ffmpeg ifaddr sqlalchemy @@ -1586,14 +1592,14 @@ "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk - "image" = ps: with ps; [ - aiohttp-cors - pillow - ]; "image_processing" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; + "image_upload" = ps: with ps; [ + aiohttp-cors + pillow + ]; "imap" = ps: with ps; [ aioimaplib ]; @@ -2667,6 +2673,8 @@ "pure_energie" = ps: with ps; [ gridnet ]; + "purpleair" = ps: with ps; [ + ]; # missing inputs: aiopurpleair "push" = ps: with ps; [ aiohttp-cors ]; @@ -2801,6 +2809,9 @@ "renault" = ps: with ps; [ renault-api ]; + "reolink" = ps: with ps; [ + reolink-aio + ]; "repairs" = ps: with ps; [ aiohttp-cors ]; @@ -3619,7 +3630,7 @@ pytrafikverket ]; "transmission" = ps: with ps; [ - transmissionrpc + transmission-rpc ]; "transport_nsw" = ps: with ps; [ pytransportnsw @@ -4102,6 +4113,7 @@ "airthings_ble" "airtouch4" "airvisual" + "airvisual_pro" "airzone" "aladdin_connect" "alarm_control_panel" @@ -4354,8 +4366,8 @@ "icloud" "ifttt" "ign_sismologia" - "image" "image_processing" + "image_upload" "imap_email_content" "influxdb" "inkbird" @@ -4552,6 +4564,7 @@ "radarr" "radio_browser" "radiotherm" + "rainbird" "rainforest_eagle" "rainmachine" "random" @@ -4562,6 +4575,7 @@ "reddit" "remote" "renault" + "reolink" "repairs" "rest" "rest_command" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9b7f66f4a020..bc7fc267dafa 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -85,17 +85,6 @@ let }; }); - hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec { - pname = "ha-hap-python"; - version = "4.5.2"; - src = fetchFromGitHub { - owner = "bdraco"; - repo = "ha-HAP-python"; - rev = "refs/tags/v4.5.2"; - hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig="; - }; - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -206,7 +195,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.12.9"; + hassVersion = "2023.1.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -224,7 +213,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tf2H4+79CGTmbKZtJpzYOzAgi90RpSy89hoDNS24m0Q="; + hash = "sha256-uYQnymJQ893F5fX/yi8S3OZL4LkT5z7QNOzkoedXllM="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -301,11 +290,13 @@ in python.pkgs.buildPythonApplication rec { checkInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) freezegun + pytest-asyncio pytest-aiohttp pytest-freezegun pytest-mock pytest-rerunfailures pytest-socket + pytest-unordered pytest-xdist pytestCheckHook requests-mock diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index e91913798a18..2f694ac96855 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 = "20221213.1"; + version = "20230104.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-QL+3dIZlUJstRgK80ANnK9CKR4muvfEQz16bTTMS3Fs="; + hash = "sha256-tzn+TGhEcbXRly1iTLQr1UkG7y2NwLZTobDqmDe1JHo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index a77b48c6b17e..162bb4af04b9 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -39,7 +39,7 @@ PKG_SET = "home-assistant.python.pkgs" PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "ha-av": "av", - "ha-HAP-python": "hap-python", + "HAP-python": "hap-python", "tensorflow": "tensorflow", "youtube_dl": "youtube-dl-light", } diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index cbcd0847b790..601d0fe0367f 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -14,6 +14,7 @@ let generic = [ av ]; google_translate = [ mutagen ]; google_sheets = [ oauth2client ]; + govee_ble = [ ibeacon-ble ]; hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];