diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index cd4464b2f58f..153e05c0a2ed 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.7.1"; + version = "2024.7.2"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -269,7 +269,7 @@ "arve" = ps: with ps; [ ]; # missing inputs: asyncarve "arwn" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "aseko_pool_live" = ps: with ps; [ aioaseko @@ -335,7 +335,7 @@ ]; "axis" = ps: with ps; [ axis - paho-mqtt + paho-mqtt_1 ]; "azure_data_explorer" = ps: with ps; [ ]; # missing inputs: azure-kusto-data azure-kusto-ingest @@ -947,13 +947,13 @@ ]; "drop_connect" = ps: with ps; [ dropmqttapi - paho-mqtt + paho-mqtt_1 ]; "dsmr" = ps: with ps; [ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "dte_energy_bridge" = ps: with ps; [ ]; @@ -1431,7 +1431,7 @@ "fujitsu_anywair" = ps: with ps; [ ]; "fully_kiosk" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 python-fullykiosk ]; "futurenow" = ps: with ps; [ @@ -2595,7 +2595,7 @@ "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "map" = ps: with ps; [ fnv-hash-fast @@ -2906,19 +2906,19 @@ mpd2 ]; "mqtt" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "mqtt_eventstream" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "mqtt_json" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "mqtt_room" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "mqtt_statestream" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "msteams" = ps: with ps; [ pymsteams @@ -2942,7 +2942,7 @@ "myq" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 pymysensors ]; "mystrom" = ps: with ps; [ @@ -3295,7 +3295,7 @@ hassil home-assistant-intents mutagen - paho-mqtt + paho-mqtt_1 psutil-home-assistant pynacl python-matter-server @@ -4144,7 +4144,7 @@ snapcast ]; "snips" = ps: with ps; [ - paho-mqtt + paho-mqtt_1 ]; "snmp" = ps: with ps; [ pysnmp-lextudio @@ -4431,7 +4431,7 @@ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ hatasmota - paho-mqtt + paho-mqtt_1 ]; "tautulli" = ps: with ps; [ pytautulli diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index bad91d28c468..1f3cba59882b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -231,15 +231,6 @@ 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 { @@ -485,7 +476,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.7.1"; + hassVersion = "2024.7.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -503,13 +494,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-y3VYxlPit9LuC+9F+fQoJs3WD9LsvrMZMiSCqbzkgmk="; + hash = "sha256-FML1JZFj2xebcQvXJmBu02Eczz3ejg4r7PfnpBiDc50="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-pFsv0guypnRPeZOg2WrG2HL27W903iANHkvdQ8dCJHo="; + hash = "sha256-okukdAbBXJCaDpnOCDY91dsLQdm5pMJ1SKXV9A68eoQ="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b9ce34ab412b..f03474206247 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 = "20240705.0"; + version = "20240710.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-uZs/2/+fmnZzDzEuzEus0LDUNTSQIs/jL4FMBJBpXAE="; + hash = "sha256-EP4r59sgrLuK+n3ydq4LMCUS4xsT2XYE2OvK9N+Gd+M="; }; # 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 124771d5fd20..e46f29717431 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -43,6 +43,7 @@ PKG_PREFERENCES = { "HAP-python": "hap-python", "numpy": "numpy_1", "ollama-hass": "ollama", + "paho-mqtt": "paho-mqtt_1", "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy",