From a6f15abc955e6bf2b800b7d6a68966ee53130c7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Sun, 9 Apr 2023 13:14:28 +0200 Subject: [PATCH] home-assistant: 2023.4.1 -> 2023.4.2 https://github.com/home-assistant/core/releases/tag/2023.4.2 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 25 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a8576f117672..b0d56acfc1fc 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.4.1"; + version = "2023.4.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index dbca73d35ee3..359d7c1d1a47 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -109,6 +109,11 @@ let }; }); + # moto tests are a nuissance + moto = super.moto.overridePythonAttrs (_: { + doCheck = false; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -208,11 +213,11 @@ let }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.6"; + version = "2.0.9"; src = super.fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24="; + hash = "sha256-lXGSFePscze59Xw8LtoOanYZvhlKUWbAfB5Zn2r8IPo="; }; }); @@ -249,6 +254,16 @@ let }; }); + websockets = super.websockets.overridePythonAttrs (oldAttrs: rec { + version = "11.0.1"; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = "websockets"; + rev = "refs/tags/${version}"; + hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90="; + }; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -273,7 +288,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.4.1"; + hassVersion = "2023.4.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -289,7 +304,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-p9dR8q9eWxDGo+cBXO0zd9MFdB7pFeAfLfudHsYxcK8="; + hash = "sha256-Fl8CxHK8Gg4wf+kyptyiLZx8MG/eI5kTr+pSLEl729I="; }; # Secondary source is git for tests @@ -297,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-TSTn2o37XMmcU4XCPCMwvRNWW7BUadcfbK7NU/ulsNE="; + hash = "sha256-XCxFi7ts4KQdKl68YP4Ps60SWW22NoNuoGFo50xbl8s="; }; nativeBuildInputs = with python3.pkgs; [