From b9fee1ce63325a1ce2b7413c3dc3be07e25b489c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Aug 2022 18:17:18 +0200 Subject: [PATCH] home-assistant: 2022.7.7 -> 2022.8.0 https://www.home-assistant.io/blog/2022/08/03/release-20228/ --- .../home-assistant/component-packages.nix | 113 ++++++++++++------ pkgs/servers/home-assistant/default.nix | 54 +-------- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 81 insertions(+), 90 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 14e75abe990d..5e78cd2f602f 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.7.7"; + version = "2022.8.0"; components = { "abode" = ps: with ps; [ abodepy @@ -85,6 +85,7 @@ boto3 ]; "ambee" = ps: with ps; [ + aiohttp-cors ambee ]; "amberelectric" = ps: with ps; [ @@ -107,7 +108,6 @@ "analytics" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ @@ -124,6 +124,7 @@ "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ + aiohttp-cors ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka @@ -281,10 +282,16 @@ "bluesound" = ps: with ps; [ xmltodict ]; + "bluetooth" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; "bluetooth_le_tracker" = ps: with ps; [ - pygatt - ] - ++ pygatt.optional-dependencies.GATTTOOL; + aiohttp-cors + bleak + bluetooth-adapters + ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez @@ -489,11 +496,12 @@ aiodiscover aiohttp-cors async-upnp-client + bleak + bluetooth-adapters fnvhash hass-nabucasa home-assistant-frontend ifaddr - lru-dict pillow pyserial pyudev @@ -510,7 +518,6 @@ "demo" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "denon" = ps: with ps; [ @@ -711,7 +718,6 @@ "energy" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "enigma2" = ps: with ps; [ @@ -741,6 +747,9 @@ "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters construct ]; # missing inputs: python-eq3bt "esphome" = ps: with ps; [ @@ -807,7 +816,6 @@ ]; "filter" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "fints" = ps: with ps; [ @@ -830,6 +838,9 @@ fixerio ]; "fjaraskupan" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters fjaraskupan ]; "fleetgo" = ps: with ps; [ @@ -916,7 +927,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -944,7 +954,6 @@ ]; "generic_thermostat" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "geniushub" = ps: with ps; [ @@ -1024,6 +1033,11 @@ ]; "google_wifi" = ps: with ps; [ ]; + "govee_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; # missing inputs: govee-ble "gpsd" = ps: with ps; [ gps3 ]; @@ -1063,7 +1077,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1079,7 +1092,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1109,12 +1121,10 @@ "history" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "history_stats" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "hitron_coda" = ps: with ps; [ @@ -1135,11 +1145,13 @@ ]; "homeassistant" = ps: with ps; [ ]; + "homeassistant_alerts" = ps: with ps; [ + aiohttp-cors + ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1157,6 +1169,8 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors + bleak + bluetooth-adapters ifaddr zeroconf ]; @@ -1257,6 +1271,11 @@ influxdb-client influxdb ]; + "inkbird" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; # missing inputs: inkbird-ble "input_boolean" = ps: with ps; [ ]; "input_button" = ps: with ps; [ @@ -1274,7 +1293,6 @@ fnvhash home-assistant-frontend insteon-frontend-home-assistant - lru-dict pillow pyinsteon pyserial @@ -1428,7 +1446,7 @@ aiolifx aiolifx-effects ifaddr - ]; + ]; # missing inputs: aiolifx-connection "lifx_cloud" = ps: with ps; [ ]; "light" = ps: with ps; [ @@ -1471,7 +1489,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1533,7 +1550,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1613,8 +1629,8 @@ aiohttp-cors ]; "miflora" = ps: with ps; [ - bluepy - ]; # missing inputs: miflora + aiohttp-cors + ]; "mikrotik" = ps: with ps; [ librouteros ]; @@ -1633,9 +1649,15 @@ minio ]; "mitemp_bt" = ps: with ps; [ - ]; # missing inputs: mitemp_bt + aiohttp-cors + ]; "mjpeg" = ps: with ps; [ ]; + "moat" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; # missing inputs: moat-ble "mobile_app" = ps: with ps; [ pynacl pyturbojpeg @@ -1713,7 +1735,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1795,6 +1816,8 @@ "nextcloud" = ps: with ps; [ nextcloudmonitor ]; + "nextdns" = ps: with ps; [ + ]; # missing inputs: nextdns "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ @@ -1885,7 +1908,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1913,6 +1935,7 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ + aiohttp-cors ]; "opencv" = ps: with ps; [ numpy @@ -1992,7 +2015,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2000,7 +2022,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2044,7 +2065,6 @@ ]; "plant" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "plex" = ps: with ps; [ @@ -2162,6 +2182,7 @@ radios ]; "radiotherm" = ps: with ps; [ + aiohttp-cors radiotherm ]; "rainbird" = ps: with ps; [ @@ -2183,7 +2204,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2197,7 +2217,6 @@ ]; "recorder" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "recswitch" = ps: with ps; [ @@ -2218,6 +2237,9 @@ "renault" = ps: with ps; [ renault-api ]; + "repairs" = ps: with ps; [ + aiohttp-cors + ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng "rest" = ps: with ps; [ @@ -2232,6 +2254,9 @@ "rfxtrx" = ps: with ps; [ pyrfxtrx ]; + "rhasspy" = ps: with ps; [ + aiohttp-cors + ]; "ridwell" = ps: with ps; [ aioridwell ]; @@ -2298,7 +2323,6 @@ fnvhash hass-nabucasa home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2359,9 +2383,13 @@ ]; "sensor" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; + "sensorpush" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; # missing inputs: sensorpush-ble "sentry" = ps: with ps; [ sentry-sdk ]; @@ -2413,6 +2441,7 @@ pysignalclirestapi ]; "simplepush" = ps: with ps; [ + aiohttp-cors ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python @@ -2528,9 +2557,7 @@ ]; "soundtouch" = ps: with ps; [ aiohttp-cors - ifaddr libsoundtouch - zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors @@ -2575,13 +2602,13 @@ ]; "statistics" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ + aiohttp-cors steamodd ]; "steamist" = ps: with ps; [ @@ -2635,6 +2662,9 @@ ]; "switchbot" = ps: with ps; [ pyswitchbot + aiohttp-cors + bleak + bluetooth-adapters ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -2745,7 +2775,6 @@ ]; "tibber" = ps: with ps; [ fnvhash - lru-dict pytibber sqlalchemy ]; @@ -2916,6 +2945,7 @@ pyudev ]; "uscis" = ps: with ps; [ + aiohttp-cors ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ aio-geojson-usgs-earthquakes @@ -3101,6 +3131,11 @@ netdisco zeroconf ]; + "xiaomi_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; # missing inputs: xiaomi-ble "xiaomi_miio" = ps: with ps; [ construct micloud @@ -3177,7 +3212,6 @@ fnvhash home-assistant-frontend ifaddr - lru-dict pillow pyserial-asyncio pyserial @@ -3274,6 +3308,7 @@ "blebox" "blink" "blueprint" + "bluetooth" "bluetooth_le_tracker" "bmw_connected_drive" "bond" @@ -3448,6 +3483,7 @@ "home_connect" "home_plus_control" "homeassistant" + "homeassistant_alerts" "homeassistant_yellow" "homekit" "homekit_controller" @@ -3601,7 +3637,6 @@ "onvif" "open_meteo" "openalpr_cloud" - "openalpr_local" "openerz" "opengarage" "openhardwaremonitor" @@ -3656,10 +3691,12 @@ "reddit" "remote" "renault" + "repairs" "rest" "rest_command" "rflink" "rfxtrx" + "rhasspy" "ridwell" "ring" "risco" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0d56f07a69af..e12ac064b17c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -41,18 +41,6 @@ let }); }) - (self: super: { - aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: rec { - version = "0.7.20"; - src = fetchFromGitHub { - owner = "Jc2k"; - repo = "aiohomekit"; - rev = "refs/tags/${version}"; - hash = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4="; - }; - }); - }) - (self: super: { backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { version = "1.11.1"; @@ -173,18 +161,6 @@ let }); }) - (self: super: { - python-homewizard-energy = super.python-homewizard-energy.overridePythonAttrs (oldAttrs: rec { - version = "1.0.3"; - src = fetchFromGitHub { - owner = "DCSBL"; - repo = "python-homewizard-energy"; - rev = "refs/tags/v${version}"; - hash = "sha256-ioISqRFZZCojTJ/KYS8QUtoEpBNOPqY9lC9NFbZyh5A="; - }; - }); - }) - # pyunifiprotect excludes pydantic==1.9.1 (self: super: { pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec { @@ -198,18 +174,6 @@ let }); }) - (self: super: { - pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { - version = "98"; - src = fetchFromGitHub { - owner = "Kane610"; - repo = "deconz"; - rev = "refs/tags/v${version}"; - hash = "sha256-hCJRoyDWDxrBrxs2g6mVh7MOe6UMd+S8+ftfWyzWgH8="; - }; - }); - }) - (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; @@ -281,18 +245,6 @@ let }); }) - (self: super: { - wled = super.wled.overridePythonAttrs (oldAttrs: rec { - version = "0.13.2"; - src = fetchFromGitHub { - owner = "frenck"; - repo = "python-wled"; - rev = "refs/tags/v${version}"; - hash = "sha256-Rv0jaKkN6jQ7oiv1cBYx4HAr7IqPm57jZFykXayp0T0="; - }; - }); - }) - # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -332,7 +284,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.7.7"; + hassVersion = "2022.8.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -350,7 +302,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-OU6tPTBC53ogkynH6NrYiQCerPo8Fu0ZLHhNsY0emGs="; + hash = "sha256-nxSOl4K8XZWesv6o6O+YuJFrza0sEz9atiw+ZP9A5ww="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -368,6 +320,7 @@ in python.pkgs.buildPythonApplication rec { "awesomeversion" "bcrypt" "cryptography" + "home-assistant-bluetooth" "httpx" "ifaddr" "orjson" @@ -396,6 +349,7 @@ in python.pkgs.buildPythonApplication rec { ciso8601 cryptography httpx + home-assistant-bluetooth ifaddr jinja2 lru-dict diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c30afd13e6df..868b8359e7de 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 = "20220707.1"; + version = "20220802.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-nsQBMERX4DMm1s3jgDwUzWNnqP44S95AM3+RQ8MdCgI="; + sha256 = "sha256-vUK/apsaJLaR/i6I2EWPxyohps+EazOr9ZuBKoRcyCI="; }; # there is nothing to strip in this package