From 4f8c6e90015f9803903c692e28060bc115100146 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Jul 2023 01:50:11 +0200 Subject: [PATCH] home-assistant: 2023.7.2 -> 2023.7.3 https://github.com/home-assistant/core/releases/tag/2023.7.3 --- .../home-assistant/component-packages.nix | 8 ++++---- pkgs/servers/home-assistant/default.nix | 16 +++++++++++++--- .../servers/home-assistant/parse-requirements.py | 1 - 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 31dfa15c5dd..578339e4d6e 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.7.2"; + version = "2023.7.3"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -710,7 +710,6 @@ aiodiscover aiohttp-cors async-upnp-client - av bleak bleak-retry-connector bluetooth-adapters @@ -718,6 +717,7 @@ bluetooth-data-tools dbus-fast fnv-hash-fast + ha-av hass-nabucasa hassil home-assistant-frontend @@ -1364,7 +1364,7 @@ ]; "generic" = ps: with ps; [ aiohttp-cors - av + ha-av pillow ]; "generic_hygrostat" = ps: with ps; [ @@ -3882,7 +3882,7 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ aiohttp-cors - av + ha-av numpy pyturbojpeg ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 74aad1b6a26..420c18740ff 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -76,6 +76,16 @@ let doCheck = false; }); + ha-av = super.av.overridePythonAttrs (oldAttrs: rec { + pname = "ha-av"; + version = "10.1.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HjOu/A1U3CfoVq6VqxA621/9wXk8hFnTFWtdpnVoFr4="; + }; + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -287,7 +297,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.7.2"; + hassVersion = "2023.7.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -303,7 +313,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-fESzpOOEGFOJJ0ldI/VaVN0kH/zbCCq25s8vNnCUOFs="; + hash = "sha256-wYS7G3AD1G7UzXfrJxrHGpQTBLJFa7Qln1VU0pdcNro="; }; # Secondary source is git for tests @@ -311,7 +321,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-HW+XO84enAA3BH4nppkXvAERT74y5m5jvz0uHWkkS6k="; + hash = "sha256-2m0RpEQ4Rds9+JVQj5/HTmOZzYd4yWL+MfjQs923VL0="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index aca9237df24..1df4d98fb45 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -40,7 +40,6 @@ PKG_SET = "home-assistant.python.pkgs" # following can be used to choose the correct one PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 - "ha-av": "av", "HAP-python": "hap-python", "tensorflow": "tensorflow", "yt-dlp": "yt-dlp",