From 5746170ad7f2d84004f09c5cfc122b0d53c158c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Sep 2022 02:13:15 +0200 Subject: [PATCH] home-assistant: 2022.9.1 -> 2022.9.7 https://github.com/home-assistant/core/releases/tag/2022.9.7 https://github.com/home-assistant/core/releases/tag/2022.9.6 https://github.com/home-assistant/core/releases/tag/2022.9.5 https://github.com/home-assistant/core/releases/tag/2022.9.4 https://github.com/home-assistant/core/releases/tag/2022.9.3 https://github.com/home-assistant/core/releases/tag/2022.9.2 --- .../home-assistant/component-packages.nix | 49 +++++++++++- pkgs/servers/home-assistant/default.nix | 74 ++++++++++++------- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 12 ++- 4 files changed, 108 insertions(+), 31 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 46371245936c..71a928b9d856 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.9.1"; + version = "2022.9.7"; components = { "abode" = ps: with ps; [ abodepy @@ -192,9 +192,11 @@ ]; "august" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev yalexs-ble @@ -284,10 +286,12 @@ ]; "bluemaestro" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluemaestro-ble bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev ]; @@ -298,17 +302,21 @@ ]; "bluetooth" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev ]; "bluetooth_le_tracker" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev ]; @@ -354,10 +362,12 @@ ]; # missing inputs: btsmarthub_devicelist "bthome" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bthome-ble + dbus-fast pyserial pyudev ]; @@ -525,9 +535,11 @@ aiodiscover aiohttp-cors async-upnp-client + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast fnvhash hass-nabucasa home-assistant-frontend @@ -691,6 +703,7 @@ ]; # missing inputs: py-sucks "ecowitt" = ps: with ps; [ aioecowitt + aiohttp-cors ]; "eddystone_temperature" = ps: with ps; [ construct @@ -782,10 +795,12 @@ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery construct + dbus-fast pyserial pyudev ]; # missing inputs: python-eq3bt @@ -795,9 +810,11 @@ "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast ifaddr pyserial pyudev @@ -887,9 +904,11 @@ ]; "fjaraskupan" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast fjaraskupan pyserial pyudev @@ -1088,9 +1107,11 @@ ]; "govee_ble" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast govee-ble pyserial pyudev @@ -1236,9 +1257,11 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast ifaddr pyserial pyudev @@ -1343,9 +1366,11 @@ ]; "inkbird" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast inkbird-ble pyserial pyudev @@ -1516,9 +1541,11 @@ ]; "led_ble" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast led-ble pyserial pyudev @@ -1681,9 +1708,11 @@ ]; # missing inputs: py-melissa-climate "melnor" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev ]; # missing inputs: melnor-bluetooth @@ -1752,9 +1781,11 @@ ]; "moat" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast moat-ble pyserial pyudev @@ -2255,9 +2286,11 @@ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev qingping-ble @@ -2503,18 +2536,22 @@ ]; "sensorpro" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev sensorpro-ble ]; "sensorpush" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev sensorpush-ble @@ -2789,9 +2826,11 @@ "switchbot" = ps: with ps; [ pyswitchbot aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev ]; @@ -2893,18 +2932,22 @@ ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev thermobeacon-ble ]; "thermopro" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev thermopro-ble @@ -3281,9 +3324,11 @@ ]; "xiaomi_ble" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev xiaomi-ble @@ -3306,9 +3351,11 @@ ]; "yalexs_ble" = ps: with ps; [ aiohttp-cors + bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery + dbus-fast pyserial pyudev yalexs-ble diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 01dc882c156a..357e381ac741 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,17 +30,6 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (self: super: { - advantage-air = super.advantage-air.overridePythonAttrs (oldAttrs: rec { - version = "0.3.1"; - src = super.fetchPypi { - pname = "advantage_air"; - inherit version; - hash = "sha256-C+cB6oHmbr9mHZKnbls42yenQy3+L8huLk9wKazIWfU="; - }; - }); - }) - (self: super: { backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { version = "1.11.1"; @@ -67,6 +56,53 @@ let }); }) + (self: super: { + bleak = super.bleak.overridePythonAttrs (oldAttrs: rec { + version = "0.17.0"; + src = fetchFromGitHub { + owner = "hbldh"; + repo = "bleak"; + rev = "refs/tags/v${version}"; + hash = "sha256-AnH23AWrLw2jq6gSbx9VoGD8QXeCH5dN7FSVVdj4b3w="; + }; + }); + + bleak-retry-connector = super.bleak-retry-connector.overridePythonAttrs (oldAttrs: rec { + version = "1.17.1"; + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "bleak-retry-connector"; + rev = "refs/tags/v${version}"; + hash = "sha256-FoQ1cDORQaJcr6y9JaO4MigqV6jiBbwKNIIdYDgFNxQ="; + }; + }); + }) + + (self: super: { + blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { + version = "2.0.2"; + src = fetchFromGitHub { + owner = "blebox"; + repo = "blebox_uniapi"; + rev = "refs/tags/v${version}"; + hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; + }; + }); + }) + + (self: super: { + bluetooth-adapters = super.bluetooth-adapters.overridePythonAttrs (oldAttrs: rec { + version = "0.4.1"; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.dbus-fast ]; + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "bluetooth-adapters"; + rev = "refs/tags/v${version}"; + hash = "sha256-LAT4r6RHJWTkrZvuL1aSQDiztvXiOJwGmNQKGFnvFB8="; + }; + }); + }) + (self: super: { gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { version = "4.0.0"; @@ -268,18 +304,6 @@ let }); }) - (self: super: { - xiaomi-ble = super.xiaomi-ble.overridePythonAttrs (oldAttrs: rec { - version = "0.9.0"; - src = fetchFromGitHub { - owner = "Bluetooth-Devices"; - repo = "xiaomi-ble"; - rev = "refs/tags/v${version}"; - hash = "sha256-xdh8WHrSkbuOGqSiIiufjiVaO719DMDYzbprE3s2kmQ="; - }; - }); - }) - # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -309,7 +333,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.9.1"; + hassVersion = "2022.9.7"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -327,7 +351,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-JXMLIMiwM1givdV6HcSGHI9v3zh8gMiF9khaGWR5e9I="; + hash = "sha256-V6/y5HnJh8AVwkSg3uanYQRNvDcD1P0L+wBu98NpDek="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 8654b23ff187..0807320ff1a6 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 = "20220907.0"; + version = "20220907.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-G/2lOUffxKnEmd4mz/qAlNkzTNAUTfjKaGgvj6vG9ro="; + sha256 = "sha256-ykId53EMPRXmMmoS55ZtjF6UR/JVPtBXFqjwuK2E2F4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 196da7e63953..feb7331f05de 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -52,6 +52,10 @@ let # Sandbox network limitations, fails with unexpected error "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" ]; + dnsip = [ + # AssertionError: assert == + "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" + ]; history_stats = [ # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" @@ -66,6 +70,10 @@ let "--deselect tests/components/stream/test_recorder.py::test_recorder_log" "--deselect tests/components/stream/test_worker.py::test_get_image" ]; + zha = [ + # AssertionError: assert 'manual_pick_radio_type' == 'choose_serial_port' + "--deselect tests/components/zha/test_config_flow.py::test_options_flow_restarts_running_zha_if_cancelled" + ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { @@ -96,9 +104,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - "blebox" # all tests fail with: AttributeError: Mock object has no attribute 'async_from_host' - "dnsip" - "ssdp" + "modem_callerid" "subaru" ]; # upstream only tests on Linux, so do we.