diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 00:02:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 00:02:21 +0000 |
commit | 912311b7fd205f8542aaac6e26251bcb0b92fa7c (patch) | |
tree | 26d796194c7c4876ab89abc33183afb8be38621b /pkgs/servers/home-assistant/default.nix | |
parent | 96ec4cfbb67ebbe7661ea77d65df06399888151d (diff) | |
parent | 02f05fceedefc00f90ecf27bda9e94ed2318aa50 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/home-assistant/default.nix')
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 755409e1db268..533e0e631ba33 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,7 +3,6 @@ , callPackage , fetchFromGitHub , fetchPypi -, fetchpatch , python311 , substituteAll , ffmpeg-headless @@ -193,6 +192,15 @@ let }; }); + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.9.6"; + src = fetchPypi { + pname = "psutil"; + inherit version; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; + }; + }); + py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { version = "2.1.4"; src = fetchFromGitHub { @@ -310,17 +318,6 @@ let doCheck = false; }); - # Pinned due to API changes in 0.3.0 - tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { - version = "0.2.0"; - src = fetchFromGitHub { - owner = "frenck"; - repo = "python-tailscale"; - rev = "refs/tags/v${version}"; - hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -356,7 +353,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.11.1"; + hassVersion = "2023.11.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -372,7 +369,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-4OIvY6blun++7JDY+B0Cjrr4yNgnjTd8G55SWkhS3Cs="; + hash = "sha256-cnneRq0hIyvgKo0du/52ze0IVs8TgTPNQM3T1kyy03s="; }; # Secondary source is git for tests @@ -380,7 +377,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-Z/CV1sGdJsdc4OxUZulC0boHaMP7WpajbY8Y6R9Q//I="; + hash = "sha256-OljfYmlXSJVoWWsd4jcSF4nI/FXHqRA8e4LN5AaPVv8="; }; nativeBuildInputs = with python.pkgs; [ @@ -396,17 +393,14 @@ in python.pkgs.buildPythonApplication rec { # leave this in, so users don't have to constantly update their downstream patch handling patches = [ + # Follow symlinks in /var/lib/hass/www + ./patches/static-symlinks.patch + + # Patch path to ffmpeg binary (substituteAll { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; }) - (fetchpatch { - # freeze time in litterrobot tests - # https://github.com/home-assistant/core/pull/103444 - name = "home-assistant-litterrobot-freeze-test-time.patch"; - url = "https://github.com/home-assistant/core/commit/806205952ff863e2cf1875be406ea0254be5f13a.patch"; - hash = "sha256-OVbmJWy275nYWrif9awAGIYlgZqrRPcYBhB0Vil8rmk="; - }) ]; postPatch = let @@ -526,6 +520,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_entity_registry.py::test_get_or_create_updates_data" # AssertionError: assert 2 == 1 "--deselect=tests/helpers/test_entity_values.py::test_override_single_value" + # AssertionError: assert 'WARNING' not in '2023-11-10 ...nt abc[L]>\n'" + "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # tests are located in tests/ "tests" ]; |