diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e7db616aa915..3ef026d87b89 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,12 @@ # Do not edit! { - version = "2024.6.4"; + version = "2024.7.0"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ jaraco-abode - jaraco-functools ]; "accuweather" = ps: with ps; [ accuweather @@ -111,10 +110,6 @@ aioairzone-cloud ]; "aladdin_connect" = ps: with ps; [ - fnv-hash-fast - genie-partner-sdk - psutil-home-assistant - sqlalchemy ]; "alarm_control_panel" = ps: with ps; [ ]; @@ -220,6 +215,12 @@ ]; "apsystems" = ps: with ps; [ ]; # missing inputs: apsystems-ez1 + "aquacell" = ps: with ps; [ + fnv-hash-fast + ifaddr + psutil-home-assistant + sqlalchemy + ]; # missing inputs: aioaquacell "aqualogic" = ps: with ps; [ aqualogic ]; @@ -627,9 +628,6 @@ "channels" = ps: with ps; [ pychannels ]; - "circuit" = ps: with ps; [ - circuit-webhook - ]; "cisco_ios" = ps: with ps; [ pexpect ]; @@ -808,12 +806,8 @@ deluge-client ]; "demo" = ps: with ps; [ - fnv-hash-fast hassil home-assistant-intents - pillow - psutil-home-assistant - sqlalchemy ]; "denon" = ps: with ps; [ ]; @@ -833,10 +827,7 @@ "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ - fnv-hash-fast pillow - psutil-home-assistant - sqlalchemy ]; "device_tracker" = ps: with ps; [ ]; @@ -1072,7 +1063,7 @@ pyemby ]; "emoncms" = ps: with ps; [ - ]; + ]; # missing inputs: pyemoncms "emoncms_history" = ps: with ps; [ ]; "emonitor" = ps: with ps; [ @@ -1578,7 +1569,6 @@ hassil home-assistant-intents mutagen - voluptuous-openapi webrtc-noise-gain ]; "google_mail" = ps: with ps; [ @@ -1667,10 +1657,6 @@ "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality "group" = ps: with ps; [ - fnv-hash-fast - pillow - psutil-home-assistant - sqlalchemy ]; "growatt_server" = ps: with ps; [ growattserver @@ -2161,6 +2147,8 @@ ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss + "ista_ecotrend" = ps: with ps; [ + ]; # missing inputs: pyecotrend-ista "isy994" = ps: with ps; [ pyisy ]; @@ -2280,6 +2268,8 @@ "kmtronic" = ps: with ps; [ pykmtronic ]; + "knocki" = ps: with ps; [ + ]; # missing inputs: knocki "knx" = ps: with ps; [ fnv-hash-fast home-assistant-frontend @@ -2637,6 +2627,9 @@ ]; "mazda" = ps: with ps; [ ]; + "mealie" = ps: with ps; [ + aiomealie + ]; "meater" = ps: with ps; [ meater-python ]; @@ -3162,8 +3155,7 @@ pyownet ]; "onkyo" = ps: with ps; [ - onkyo-eiscp - ]; + ]; # missing inputs: pyeiscp "onvif" = ps: with ps; [ ha-ffmpeg onvif-zeep-async @@ -3178,7 +3170,6 @@ home-assistant-intents mutagen openai - voluptuous-openapi webrtc-noise-gain ]; "openalpr_cloud" = ps: with ps; [ @@ -3512,12 +3503,14 @@ aiopvpc ]; "pyload" = ps: with ps; [ + pyloadapi ]; "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ - ]; # missing inputs: python-qbittorrent + qbittorrent-api + ]; "qingping" = ps: with ps; [ aioesphomeapi aioruuvigateway @@ -3893,7 +3886,6 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ fnv-hash-fast - pillow psutil-home-assistant sqlalchemy ]; @@ -4189,8 +4181,7 @@ "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ - sunwatcher - ]; + ]; # missing inputs: solarlog_cli "solax" = ps: with ps; [ solax ]; @@ -4472,10 +4463,6 @@ temperusb ]; "template" = ps: with ps; [ - fnv-hash-fast - pillow - psutil-home-assistant - sqlalchemy ]; "tensorflow" = ps: with ps; [ numpy @@ -4490,6 +4477,7 @@ tesla-fleet-api ]; "tessie" = ps: with ps; [ + tesla-fleet-api ]; # missing inputs: tessie-api "text" = ps: with ps; [ ]; @@ -5550,6 +5538,7 @@ "image_processing" "image_upload" "imap" + "incomfort" "influxdb" "inkbird" "input_boolean" @@ -5634,6 +5623,7 @@ "matter" "maxcube" "mazda" + "mealie" "meater" "media_extractor" "media_player" @@ -5667,6 +5657,7 @@ "motionblinds_ble" "motioneye" "motionmount" + "mpd" "mqtt" "mqtt_eventstream" "mqtt_json" @@ -5736,6 +5727,7 @@ "opower" "oralb" "otbr" + "otp" "overkiz" "ovo_energy" "owntracks" @@ -5771,7 +5763,9 @@ "pushover" "pvoutput" "pvpc_hourly_pricing" + "pyload" "python_script" + "qbittorrent" "qingping" "qld_bushfire" "qnap" @@ -5872,7 +5866,6 @@ "snips" "snmp" "snooz" - "solarlog" "solax" "soma" "somfy_mylink" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 49f273480549..3dfee4841d6f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , fetchPypi +, fetchpatch2 , python312 , substituteAll , ffmpeg-headless @@ -93,18 +94,6 @@ let ''; }); - aiowithings = super.aiowithings.overridePythonAttrs (oldAttrs: rec { - version = "2.1.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) - owner - repo - ; - rev = "refs/tags/${version}"; - hash = "sha256-+pIIVCR+QsW9M3pH9Ss3dMvkeKM1OdhQ1y+s/T6pHtk="; - }; - }); - astral = super.astral.overridePythonAttrs (oldAttrs: rec { pname = "astral"; version = "2.2"; @@ -192,64 +181,15 @@ let doCheck = false; # requires asynctest, which does not work on python 3.11 }); - jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { - version = "3.3.0"; + openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { + version = "2.2"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio="; + rev = "refs/tags/${version}"; + hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; }); - jaraco-collections = super.jaraco-collections.overridePythonAttrs (oldAttrs: rec { - version = "3.4.0"; - src = fetchPypi { - pname = "jaraco.collections"; - inherit version; - hash = "sha256-NE0Udp1xbnSWr4eaxxs8br3UarxkvZ7CHRUkg2WqOsk="; - }; - }); - - jaraco-functools = super.jaraco-functools.overridePythonAttrs (oldAttrs: rec { - version = "3.9.0"; - src = fetchPypi { - pname = "jaraco.functools"; - inherit version; - hash = "sha256-ixN7D+rMF/70us7gTAEcnobyNBCZyHCh0S0743sypjg="; - }; - }); - - lmcloud = super.lmcloud.overridePythonAttrs (oldAttrs: rec { - version = "0.4.35"; - src = fetchFromGitHub { - owner = "zweckj"; - repo = "lmcloud"; - rev = "refs/tags/v${version}"; - hash = "sha256-TUve21yamtEmEceK/V1w7IZjnMgKConMfSY/GlqFpp8="; - }; - }); - - lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { - version = "5.1.0"; - pyprojet = true; - - src = fetchFromGitHub { - owner = "lxml"; - repo = "lxml"; - rev = "refs/tags/lxml-${version}"; - hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; - }; - - nativeBuildInputs = with self; [ - cython - setuptools - libxml2.dev - libxslt.dev - ]; - - patches = []; - }); - pymelcloud = super.pymelcloud.overridePythonAttrs (oldAttrs: { version = "2.5.9"; src = fetchFromGitHub { @@ -282,17 +222,6 @@ let doCheck = false; # no tests }); - # Can probably be removed with 2024.6.0 - plugwise = super.plugwise.overridePythonAttrs rec { - version = "0.37.3"; - src = fetchFromGitHub { - owner = "plugwise"; - repo = "python-plugwise"; - rev = "refs/tags/v${version}"; - hash = "sha256-aQz0p+DNi1XVoFwdFjc3RjpHqA2kGf4pU1QS6m271gU="; - }; - }; - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -303,6 +232,15 @@ let }; }); + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.9.8"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="; + }; + }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { version = "0.4.8"; src = fetchPypi { @@ -548,7 +486,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.6.4"; + hassVersion = "2024.7.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -566,13 +504,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-WIAFTVNHzrKTRONmOc/lq5PvC34PDKF7UfIokLCVzNY="; + hash = "sha256-0+h8Ml/EuEqfTh+TXyrCw07GpyyL84NlgJwPbLc/8XU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-Ymv3AlArAD2rSXQwMhEVeynwhAo8ZMrtV1zUK4U8xqQ="; + hash = "sha256-bxA6iJ90SYM8HOexyq5biKzTlQvU+V2UGtrKMR2+KWQ="; }; build-system = with python.pkgs; [ @@ -612,6 +550,12 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; }) + + (fetchpatch2 { + # https://github.com/home-assistant/core/pull/121135 + url = "https://github.com/home-assistant/core/commit/b6a23fad3537e0baa026b2a7eb5bff8a4246780b.patch"; + hash = "sha256-eXUc8PRAHgX2JJ4VuTuu1/UB14H6x3LyFNwjLCfADaY="; + }) ]; postPatch = '' @@ -662,6 +606,7 @@ in python.pkgs.buildPythonApplication rec { ulid-transform urllib3 voluptuous + voluptuous-openapi voluptuous-serialize yarl # REQUIREMENTS in homeassistant/auth/mfa_modules/totp.py and homeassistant/auth/mfa_modules/notify.py diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f3e6062d5b26..0f65a8d80506 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 = "20240610.1"; + version = "20240703.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-6XSDKPL+rbtP/jGYbvzc5cakEZC94sDetmPuM7TQQ64="; + hash = "sha256-O6BpAQrMcP+h33tT2IxuupKo+5qkkDYXNwd6XCrj0CU="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index df410fb49862..0c559189a039 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -42,6 +42,7 @@ PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "HAP-python": "hap-python", "ollama-hass": "ollama", + "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", "tensorflow": "tensorflow",