diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ed225ee308f8..f2a532c6f71a 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 = "2024.3.3"; + version = "2024.4.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -283,7 +283,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ @@ -362,7 +361,6 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng axis - janus paho-mqtt ]; "azure_devops" = ps: with ps; [ @@ -856,7 +854,6 @@ home-assistant-frontend home-assistant-intents ifaddr - janus mutagen numpy pillow @@ -1056,7 +1053,6 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng dropmqttapi - janus paho-mqtt ]; "dsmr" = ps: with ps; [ @@ -1066,7 +1062,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ @@ -1096,7 +1091,6 @@ dynalite-panel fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -1183,6 +1177,9 @@ pypca ]; "elvia" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1386,11 +1383,13 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1560,7 +1559,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -1574,13 +1572,15 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt python-fullykiosk ]; "futurenow" = ps: with ps; [ pyfnip ]; + "fyta" = ps: with ps; [ + fyta-cli + ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ @@ -1633,6 +1633,9 @@ "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1917,6 +1920,9 @@ sqlalchemy ]; "history_stats" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1956,7 +1962,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -1978,7 +1983,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -2000,7 +2004,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -2022,7 +2025,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -2355,7 +2357,6 @@ fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant - janus pillow psutil-home-assistant pyinsteon @@ -2526,6 +2527,9 @@ pykira ]; "kitchen_sink" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -2542,7 +2546,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus knx-frontend pillow psutil-home-assistant @@ -2583,7 +2586,34 @@ "lacrosse_view" = ps: with ps; [ ]; # missing inputs: lacrosse-view "lamarzocco" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + aioruuvigateway + aioshelly + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr lmcloud + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf ]; "lametric" = ps: with ps; [ aiohttp-cors @@ -2798,7 +2828,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -2839,6 +2868,10 @@ webrtc-noise-gain ]; "lovelace" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + pillow ]; "luci" = ps: with ps; [ openwrt-luci-rpc @@ -2887,7 +2920,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "map" = ps: with ps; [ @@ -2896,7 +2928,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3205,6 +3236,35 @@ psutil-home-assistant sqlalchemy ]; + "motionblinds_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + aioruuvigateway + aioshelly + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: motionblindsble "motioneye" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -3221,35 +3281,30 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_json" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "msteams" = ps: with ps; [ @@ -3270,7 +3325,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3281,7 +3335,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt pymysensors ]; @@ -3468,7 +3521,7 @@ "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ - pynut2 + aionut ]; "nutrichef" = ps: with ps; [ ]; @@ -3495,6 +3548,13 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; + "ollama" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + hassil + home-assistant-intents + ]; # missing inputs: ollama-hass "ombi" = ps: with ps; [ pyombi ]; @@ -3505,10 +3565,7 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast pillow - psutil-home-assistant - sqlalchemy ]; "oncue" = ps: with ps; [ aiooncue @@ -3543,9 +3600,6 @@ ]; "openalpr_cloud" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ - numpy - ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ openerz-api ]; @@ -3582,6 +3636,9 @@ pyopnsense ]; "opower" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast opower psutil-home-assistant @@ -3637,7 +3694,6 @@ bellows fnv-hash-fast ifaddr - janus pillow psutil-home-assistant pyroute2 @@ -3676,7 +3732,6 @@ hass-nabucasa hassil home-assistant-intents - janus mutagen paho-mqtt psutil-home-assistant @@ -3704,7 +3759,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3715,7 +3769,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3787,6 +3840,9 @@ webrtc-noise-gain ]; "plant" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4086,6 +4142,9 @@ aiorecollect ]; "recorder" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4100,7 +4159,6 @@ hassil home-assistant-frontend home-assistant-intents - janus mutagen pillow psutil-home-assistant @@ -4390,6 +4448,9 @@ zeroconf ]; "sensor" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4503,6 +4564,7 @@ dbus-fast fnv-hash-fast habluetooth + ifaddr psutil-home-assistant pyserial pyudev @@ -4619,6 +4681,8 @@ ]; "smtp" = ps: with ps; [ ]; + "smud" = ps: with ps; [ + ]; "snapcast" = ps: with ps; [ snapcast ]; @@ -4626,7 +4690,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "snmp" = ps: with ps; [ @@ -4767,6 +4830,9 @@ xmltodict ]; "statistics" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4954,7 +5020,6 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng hatasmota - janus paho-mqtt ]; "tautulli" = ps: with ps; [ @@ -4978,16 +5043,14 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - pysocks python-telegram-bot - ]; + ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "telegram_bot" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - pysocks python-telegram-bot - ]; + ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "tellduslive" = ps: with ps; [ tellduslive ]; @@ -5106,6 +5169,9 @@ "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pytibber @@ -5805,7 +5871,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -6000,6 +6065,7 @@ "dnsip" "doorbird" "dormakaba_dkey" + "downloader" "dremel_3d_printer" "drop_connect" "dsmr" @@ -6080,6 +6146,7 @@ "frontend" "frontier_silicon" "fully_kiosk" + "fyta" "garages_amsterdam" "gardena_bluetooth" "gdacs" @@ -6148,6 +6215,7 @@ "homematic" "homematicip_cloud" "homewizard" + "homeworks" "honeywell" "html5" "http" @@ -6249,6 +6317,7 @@ "mailgun" "manual" "manual_mqtt" + "map" "matrix" "matter" "maxcube" @@ -6430,6 +6499,7 @@ "romy" "roomba" "roon" + "rova" "rpi_power" "rss_feed_template" "rtsp_to_webrtc" @@ -6541,8 +6611,6 @@ "tcp" "technove" "tedee" - "telegram" - "telegram_bot" "tellduslive" "temper" "template" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 797b2ecae5f6..9371bd03aff1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,19 +134,6 @@ let ]; }); - bluecurrent-api = super.bluecurrent-api.overridePythonAttrs (oldAttrs: rec { - version = "1.0.6"; - src = fetchPypi { - pname = "bluecurrent-api"; - inherit version; - hash = "sha256-XHVdtkiG0ff/OY8g+W5iur7OAyhhk1UGA+XUfB2L8/o="; - }; - build-system = oldAttrs.build-system ++ (with self; [ - pythonRelaxDepsHook - ]); - pythonRemoveDeps = [ "asyncio" ]; - }); - debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { # tests are deadlocking too often # https://github.com/NixOS/nixpkgs/issues/262000 @@ -424,26 +411,6 @@ let }; }); - pywaze = super.pywaze.overridePythonAttrs (oldAttrs: rec { - version = "0.5.1"; - src = fetchFromGitHub { - owner = "eifinger"; - repo = "pywaze"; - rev = "refs/tags/v${version}"; - hash = "sha256-r7ROEdgHdjXkveVUbuALHtwCX4IO0lwx9Zo3u6R9I58="; - }; - }); - - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.27"; - src = fetchFromGitHub { - owner = "sqlalchemy"; - repo = "sqlalchemy"; - rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6R+A7rVq1olRXj1wMolHhEq418bpr5rsmH8RjxajmmQ="; - }; - }); - tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { version = "0.5.1"; src = fetchFromGitHub { @@ -541,7 +508,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.3.3"; + hassVersion = "2024.4.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -559,13 +526,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-EutnNqENt1MTmbMe9vtSM+bM5PzvjsfMhpkwXdxWoeI="; + hash = "sha256-Qca6BHeId/fHhIViU7BJhYXxoMxRSeaJQ7CJLmIBmuU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-9i8snvozDKgvcEQfk9KTYfqHxQbDBluvArXYVVnNvnA="; + hash = "sha256-SGXqDjt2wzC/rTAGlV8DSFxauUvIrG3RgOxPCUsAJQ0="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ec699e83164a..47d933077730 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 = "20240307.0"; + version = "20240403.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Wy5TzJ6+Dbkk51TMt9zGIfjI7gMrT4mK0IIRnl4byVE="; + hash = "sha256-kvgyecLgp5KFhwKl4AGhbJeq1mwhR0UVcjeZqaB+6nQ="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index cefdc1f8746a..3707e3f105a6 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.3.3"; + version = "2024.4.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-Qc+pwG87R57wGyCujMQ6qygDOhRh/FoDf1HTRZS3M6s="; + hash = "sha256-5igsxs0/1S0sYlaNxFSsTAo9HkIAqn3XZ031VjAkEQg="; }; nativeBuildInputs = [