From b57f066dea90ec16a3f24d5d82629c56595b964c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 23:43:50 +0200 Subject: [PATCH] home-assistant: 2023.5.4 -> 2023.6.0 https://www.home-assistant.io/blog/2023/06/07/release-20236/ --- .../home-assistant/component-packages.nix | 71 ++++++++++++++----- pkgs/servers/home-assistant/default.nix | 27 +------ pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/intents.nix | 5 ++ 4 files changed, 65 insertions(+), 42 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1583198cae3f..7bebac1b445a 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 = "2023.5.4"; + version = "2023.6.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -93,6 +93,9 @@ "airzone" = ps: with ps; [ aioairzone ]; + "airzone_cloud" = ps: with ps; [ + aioairzone-cloud + ]; "aladdin_connect" = ps: with ps; [ aioaladdinconnect ]; @@ -686,6 +689,10 @@ "datadog" = ps: with ps; [ datadog ]; + "date" = ps: with ps; [ + ]; + "datetime" = ps: with ps; [ + ]; "ddwrt" = ps: with ps; [ ]; "debugpy" = ps: with ps; [ @@ -902,8 +909,15 @@ "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ + aiohttp-cors dynalite-devices - ]; + fnv-hash-fast + home-assistant-frontend + janus + pillow + psutil-home-assistant + sqlalchemy + ]; # missing inputs: dynalite_panel "eafm" = ps: with ps; [ aioeafm ]; @@ -947,6 +961,8 @@ "eight_sleep" = ps: with ps; [ pyeight ]; + "electrasmart" = ps: with ps; [ + ]; # missing inputs: pyelectra "elgato" = ps: with ps; [ elgato ]; @@ -1395,8 +1411,6 @@ "glances" = ps: with ps; [ glances-api ]; - "goalfeed" = ps: with ps; [ - ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; @@ -1430,6 +1444,11 @@ ]; "google_domains" = ps: with ps; [ ]; + "google_generative_ai_conversation" = ps: with ps; [ + aiohttp-cors + hassil + home-assistant-intents + ]; # missing inputs: google-generativeai "google_mail" = ps: with ps; [ aiohttp-cors fnv-hash-fast @@ -1898,8 +1917,7 @@ zeroconf ]; "iotawatt" = ps: with ps; [ - iotawattpy - ]; + ]; # missing inputs: ha-iotawattpy "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ @@ -1945,6 +1963,8 @@ "justnimbus" = ps: with ps; [ justnimbus ]; + "jvc_projector" = ps: with ps; [ + ]; # missing inputs: pyjvcprojector "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kaleidescape" = ps: with ps; [ @@ -2034,8 +2054,15 @@ ]; "knx" = ps: with ps; [ aiohttp-cors + fnv-hash-fast + home-assistant-frontend janus + knx-frontend + pillow + psutil-home-assistant + sqlalchemy xknx + xknxproject ]; "kodi" = ps: with ps; [ aiohttp-cors @@ -2577,8 +2604,6 @@ psutil-home-assistant sqlalchemy ]; - "mycroft" = ps: with ps; [ - ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; @@ -2838,7 +2863,7 @@ opensensemap-api ]; "opensky" = ps: with ps; [ - ]; + ]; # missing inputs: python-opensky "opentherm_gw" = ps: with ps; [ pyotgw ]; @@ -2991,6 +3016,8 @@ ]; "pioneer" = ps: with ps; [ ]; + "piper" = ps: with ps; [ + ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ @@ -3672,8 +3699,6 @@ "smarttub" = ps: with ps; [ python-smarttub ]; - "smarty" = ps: with ps; [ - ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ smhi-pkg ]; @@ -4124,6 +4149,8 @@ webrtcvad zeroconf ]; + "time" = ps: with ps; [ + ]; "time_date" = ps: with ps; [ ]; "timer" = ps: with ps; [ @@ -4417,9 +4444,6 @@ ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf - "watson_tts" = ps: with ps; [ - ibm-watson - ]; "watttime" = ps: with ps; [ aiowatttime ]; @@ -4446,6 +4470,8 @@ "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; + "whisper" = ps: with ps; [ + ]; "whois" = ps: with ps; [ whois ]; @@ -4557,6 +4583,8 @@ ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client + "yale_home" = ps: with ps; [ + ]; "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; @@ -4629,6 +4657,13 @@ "youless" = ps: with ps; [ youless-api ]; + "youtube" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + google-api-python-client + psutil-home-assistant + sqlalchemy + ]; "zabbix" = ps: with ps; [ py-zabbix ]; @@ -4723,6 +4758,7 @@ "airvisual" "airvisual_pro" "airzone" + "airzone_cloud" "aladdin_connect" "alarm_control_panel" "alarmdecoder" @@ -4809,6 +4845,8 @@ "crownstone" "daikin" "datadog" + "date" + "datetime" "debugpy" "deconz" "default_config" @@ -4838,7 +4876,7 @@ "dte_energy_bridge" "duckdns" "dunehd" - "dynalite" + "dwd_weather_warnings" "eafm" "easyenergy" "ecobee" @@ -5001,7 +5039,6 @@ "intent" "intent_script" "ios" - "iotawatt" "ipma" "ipp" "iqvia" @@ -5337,6 +5374,7 @@ "tibber" "tile" "tilt_ble" + "time" "time_date" "timer" "tod" @@ -5433,6 +5471,7 @@ "yeelight" "yolink" "youless" + "youtube" "zamg" "zeroconf" "zerproc" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 72a1525ad739..0c0b34712a5a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -183,16 +183,6 @@ let }; }); - python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { - version = "0.8.3"; - src = fetchFromGitHub { - owner = "humbertogontijo"; - repo = "python-roborock"; - rev = "refs/tags/v${version}"; - hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0="; - }; - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -261,17 +251,6 @@ let }; }); - # Pinned due to API changes in 0.4.0 - vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { - version = "0.3.3"; - src = fetchFromGitHub { - owner = "ManneW"; - repo = "vilfo-api-client-python"; - rev = "v${version}"; - sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -317,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.5.4"; + hassVersion = "2023.6.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -333,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-mRiRKMafRkgAOshH/5i6yj379FEzZgXhkdkK557sMaQ="; + hash = "sha256-dEszA95EIwGMR2Ztpe7P8weh4FbqGJBkso7nCvTkPDc="; }; # Secondary source is git for tests @@ -341,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-r28BhC6lBIoxu7Wp/1h+qgPEDaUCqH4snyKk/h/vgyQ="; + hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 94d868e3dbb4..ff33cc8cee91 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 = "20230503.3"; + version = "20230607.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-BOSXRpHgHUygrbd7LaGHFj5aM+Bfp5VkB791tJ5jCwU="; + hash = "sha256-O3hAF3QgZHm6q+manxlqWZLlSDxHMr86B3GdwMClxEk="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 37cb2abf83c9..ae247b9e7a08 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { sourceRoot = "source/package"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "2023.4.26" "${version}" + ''; + nativeBuildInputs = [ hassil jinja2