From 0e13e113989df31d6e290d99764584b581420a03 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Jun 2021 21:16:08 +0200 Subject: [PATCH] home-assistant: fix home-assistant-frontend update An incomplete rename of attributes caused a mismatch in expectations between the update script and what the home-assistant package exposed. --- pkgs/servers/home-assistant/default.nix | 5 ++--- pkgs/servers/home-assistant/update.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e813a0ffb84c..6bc7248f00ed 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -219,7 +219,7 @@ in with py.pkgs; buildPythonApplication rec { ''; propagatedBuildInputs = [ - # Only packages required in setup.py + hass-frontend + # Only packages required in setup.py aiohttp astral async-timeout @@ -798,11 +798,10 @@ in with py.pkgs; buildPythonApplication rec { ''; passthru = { - inherit (py.pkgs) hass-frontend; + python = py; tests = { inherit (nixosTests) home-assistant; }; - python = py; }; meta = with lib; { diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index e80b7acbed0f..5ed865f411e2 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -26,7 +26,7 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ ./parse-requirements.py ( cd ../../.. - nix-update --version "$FRONTEND_VERSION" home-assistant.hass-frontend + nix-update --version "$FRONTEND_VERSION" home-assistant.python.pkgs.home-assistant-frontend nix-update --version "$TARGET_VERSION" --build home-assistant )