From 0b2ab262bc4d935039fd392b43e94e63c18bf5ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:51:59 +0100 Subject: home-assistant: 2023.10.5 -> 2023.11.0 https://www.home-assistant.io/blog/2023/11/01/release-202311/ --- .../services/home-automation/home-assistant.nix | 1 + pkgs/servers/home-assistant/component-packages.nix | 96 ++++++++++++++++------ pkgs/servers/home-assistant/default.nix | 26 +----- pkgs/servers/home-assistant/frontend.nix | 4 +- 4 files changed, 76 insertions(+), 51 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0e6fa65667af..789b06af19b1 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -455,6 +455,7 @@ in { "govee_ble" "homekit_controller" "inkbird" + "improv_ble" "keymitt_ble" "led_ble" "medcom_ble" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d1ebe9fefa17..60248f80d7b1 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.10.5"; + version = "2023.11.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -682,6 +682,8 @@ "cpuspeed" = ps: with ps; [ py-cpuinfo ]; + "cribl" = ps: with ps; [ + ]; "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud @@ -944,6 +946,8 @@ "eafm" = ps: with ps; [ aioeafm ]; + "eastron" = ps: with ps; [ + ]; "easyenergy" = ps: with ps; [ easyenergy ]; @@ -984,7 +988,6 @@ pythonegardia ]; "eight_sleep" = ps: with ps; [ - pyeight ]; "electrasmart" = ps: with ps; [ ]; # missing inputs: pyElectra @@ -1245,6 +1248,9 @@ "fitbit" = ps: with ps; [ aiohttp-cors fitbit + fnv-hash-fast + psutil-home-assistant + sqlalchemy ]; "fivem" = ps: with ps; [ fivem-api @@ -1538,6 +1544,13 @@ psutil-home-assistant sqlalchemy ]; + "google_tasks" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + google-api-python-client + psutil-home-assistant + sqlalchemy + ]; "google_translate" = ps: with ps; [ gtts ]; @@ -1959,10 +1972,31 @@ aiohttp-cors aioimaplib ]; - "imap_email_content" = ps: with ps; [ + "improv_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors - aioimaplib - ]; + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: py-improv-ble-client "incomfort" = ps: with ps; [ incomfort-client ]; @@ -2370,6 +2404,9 @@ psutil-home-assistant sqlalchemy ]; + "local_todo" = ps: with ps; [ + ical + ]; "locative" = ps: with ps; [ aiohttp-cors ]; @@ -3241,6 +3278,8 @@ "poolsense" = ps: with ps; [ poolsense ]; + "portlandgeneral" = ps: with ps; [ + ]; "powerwall" = ps: with ps; [ tesla-powerwall ]; @@ -3332,6 +3371,7 @@ ]; "python_script" = ps: with ps; [ restrictedpython + restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -3464,6 +3504,21 @@ psutil-home-assistant sqlalchemy ]; + "recovery_mode" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + hass-nabucasa + hassil + home-assistant-frontend + home-assistant-intents + janus + mutagen + pillow + psutil-home-assistant + pyturbojpeg + sqlalchemy + webrtc-noise-gain + ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ @@ -3617,21 +3672,6 @@ "sabnzbd" = ps: with ps; [ pysabnzbd ]; - "safe_mode" = ps: with ps; [ - aiohttp-cors - fnv-hash-fast - hass-nabucasa - hassil - home-assistant-frontend - home-assistant-intents - janus - mutagen - pillow - psutil-home-assistant - pyturbojpeg - sqlalchemy - webrtc-noise-gain - ]; "saj" = ps: with ps; [ pysaj ]; @@ -3829,9 +3869,6 @@ pyudev sqlalchemy ]; - "shiftr" = ps: with ps; [ - paho-mqtt - ]; "shodan" = ps: with ps; [ shodan ]; @@ -4208,6 +4245,8 @@ "tailscale" = ps: with ps; [ tailscale ]; + "tami4" = ps: with ps; [ + ]; # missing inputs: Tami4EdgeAPI "tank_utility" = ps: with ps; [ tank-utility ]; @@ -4390,6 +4429,9 @@ ]; "tod" = ps: with ps; [ ]; + "todo" = ps: with ps; [ + aiohttp-cors + ]; "todoist" = ps: with ps; [ todoist-api-python ]; @@ -4733,6 +4775,7 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiowithings fnv-hash-fast hass-nabucasa hassil @@ -4742,7 +4785,6 @@ pyturbojpeg sqlalchemy webrtc-noise-gain - withings-api ]; "wiz" = ps: with ps; [ aiohttp-cors @@ -5231,6 +5273,7 @@ "google_mail" "google_pubsub" "google_sheets" + "google_tasks" "google_translate" "google_travel_time" "google_wifi" @@ -5290,7 +5333,6 @@ "image_processing" "image_upload" "imap" - "imap_email_content" "influxdb" "inkbird" "input_boolean" @@ -5347,6 +5389,7 @@ "local_calendar" "local_file" "local_ip" + "local_todo" "locative" "lock" "logbook" @@ -5518,6 +5561,7 @@ "rdw" "recollect_waste" "recorder" + "recovery_mode" "reddit" "remote" "renault" @@ -5544,7 +5588,6 @@ "ruuvi_gateway" "ruuvitag_ble" "sabnzbd" - "safe_mode" "samsungtv" "scene" "schedule" @@ -5657,6 +5700,7 @@ "time_date" "timer" "tod" + "todo" "todoist" "tolo" "tomato" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5f4ee05a7327..d0ca426a0144 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,26 +67,6 @@ let ]; }); - blinkpy = super.blinkpy.overridePythonAttrs (oldAttrs: rec { - version = "0.21.0"; - src = fetchFromGitHub { - owner = "fronzbot"; - repo = "blinkpy"; - rev = "refs/tags/v${version}"; - hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; - }; - }); - - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { - version = "0.33"; - src = fetchFromGitHub { - owner = "ndokter"; - repo = "dsmr_parser"; - rev = "refs/tags/v${version}"; - hash = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w="; - }; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -385,7 +365,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.5"; + hassVersion = "2023.11.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -401,7 +381,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA="; + hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q="; }; # Secondary source is git for tests @@ -409,7 +389,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk="; + hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index da86e1c698ca..ae2ef5624409 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 = "20231005.0"; + version = "20231030.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-p93bo5+VQykcuK5f0r848tMoANSexvHDVBm7f3IYOMM="; + hash = "sha256-S363j7HnOxLqCBaml1Kb9xfY0AaqBIgj09NutByn6Xo="; }; # there is nothing to strip in this package -- cgit 1.4.1