From 1e8a9f5f20902cea5340c521a08c7f2943c0c94c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Dec 2023 17:14:07 +0100 Subject: Revert "home-assistant: don't depend on matter implicitly" This reverts commit c3b7d93d1282cda4713b3608a43d34d57a26727f. Make the trade-off, that everything gets transitively marked insecure, as opposed to having lots of broken test and no signaling, when they'd actually break. --- pkgs/servers/home-assistant/component-packages.nix | 38 ++++++++++++++++++++++ pkgs/servers/home-assistant/default.nix | 14 -------- pkgs/servers/home-assistant/parse-requirements.py | 9 +---- 3 files changed, 39 insertions(+), 22 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9cbb9981bada..8fd46bf70e87 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -631,6 +631,7 @@ plexwebsocket psutil-home-assistant pychromecast + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -669,12 +670,16 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ @@ -815,6 +820,7 @@ psutil-home-assistant pynacl pyserial + python-matter-server pyturbojpeg pyudev scapy @@ -1625,7 +1631,11 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors @@ -2658,13 +2668,17 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents loqedapi mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "lovelace" = ps: with ps; [ @@ -2944,6 +2958,7 @@ pillow psutil-home-assistant pynacl + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3150,6 +3165,7 @@ mutagen psutil-home-assistant pyatmo + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3464,6 +3480,7 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil @@ -3471,8 +3488,11 @@ janus mutagen paho-mqtt + psutil-home-assistant pynacl + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ @@ -3562,13 +3582,17 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pyplaato + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "plant" = ps: with ps; [ @@ -3759,13 +3783,17 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg rachiopy + sqlalchemy webrtc-noise-gain ]; "radarr" = ps: with ps; [ @@ -3855,6 +3883,7 @@ mutagen pillow psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -4325,14 +4354,18 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pysmartapp pysmartthings + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "smarttub" = ps: with ps; [ @@ -4869,12 +4902,16 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + fnv-hash-fast ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy toonapi webrtc-noise-gain ]; @@ -5245,6 +5282,7 @@ home-assistant-intents mutagen psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index dfa87bc04552..71ef528549f9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -469,18 +469,6 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # SystemError: PyThreadState_SetAsyncExc failed "--deselect=tests/helpers/test_template.py::test_template_timeout" - # Various test failures, because we don't provide matter - # dependencies, because they depend on OpenSSL 1.1 - # https://github.com/home-assistant-libs/chip-wheels/issues/24 - # https://github.com/project-chip/connectedhomeip/issues/25688 - "--deselect=tests/helpers/test_config_entry_flow.py::test_webhook_create_cloudhook" - "--deselect=tests/helpers/test_config_entry_flow.py::test_webhook_create_cloudhook_aborts_not_connected" - "--deselect=tests/helpers/test_script.py::test_validate_action_config" - "--deselect=tests/test_bootstrap.py::test_setup_hass_invalid_core_config" - "--deselect=tests/test_bootstrap.py::test_setup_hass_invalid_yaml" - "--deselect=tests/test_bootstrap.py::test_setup_hass_recovery_mode" - "--deselect=tests/test_bootstrap.py::test_setup_hass_recovery_mode_and_safe_mode" - "--deselect=tests/test_bootstrap.py::test_setup_recovery_mode_if_no_frontend" # tests are located in tests/ "tests" ]; @@ -492,8 +480,6 @@ in python.pkgs.buildPythonApplication rec { "tests/pylint" # don't bulk test all components "tests/components" - # depends on matter depenency - "tests/helpers/test_network.py" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index ca1dc70909f5..bb5e70994320 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -119,14 +119,7 @@ def parse_components(version: str = "master"): def get_reqs(components: Dict[str, Dict[str, Any]], component: str, processed: Set[str]) -> Set[str]: requirements = set(components[component].get("requirements", [])) deps = components[component].get("dependencies", []) - after_deps = components[component].get("after_dependencies", []) - try: - # Don't propagate matter dependency through after_dependencies - # TODO: remove after matter integration moves past OpenSSL 1.1 - after_deps.remove("matter") - except ValueError: - pass - deps.extend(after_deps) + deps.extend(components[component].get("after_dependencies", [])) processed.add(component) for dependency in deps: if dependency not in processed: -- cgit 1.4.1