From 1b1aa5c5ec1c43df9379f82b78ec543c75120ffc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Dec 2023 01:47:38 +0100 Subject: [PATCH 1/2] home-assistant: 2023.12.3 -> 2023.12.4 https://github.com/home-assistant/core/releases/tag/2023.12.4 --- .../home-assistant/component-packages.nix | 3 +- pkgs/servers/home-assistant/default.nix | 64 +++++++++++++++++-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b33a9ec352d9..6c8157496d45 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.12.3"; + version = "2023.12.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -5603,6 +5603,7 @@ "android_ip_webcam" "androidtv" "androidtv_remote" + "anova" "anthemav" "apache_kafka" "apcupsd" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 29427a31c1be..6b492197d7ab 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { + version = "0.3.1"; + src = fetchFromGitHub { + owner = "CorantGmbH"; + repo = "aioairq"; + rev = "refs/tags/v${version}"; + hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk="; + }; + }); + aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { version = "19.2.1"; src = fetchFromGitHub { @@ -52,6 +62,16 @@ let doCheck = false; }); + aiohttp-zlib-ng = super.aiohttp-zlib-ng.overridePythonAttrs (oldAttrs: rec { + version = "0.1.1"; + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-zlib-ng"; + rev = "refs/tags/v${version}"; + hash = "sha256-dTNwt4eX6ZQ8ySK2/9ziVbc3KFg2aL/EsiBWaJRC4x8="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -168,6 +188,32 @@ let doCheck = false; # no tests }); + openai = super.openai.overridePythonAttrs (oldAttrs: rec { + version = "0.28.1"; + src = fetchFromGitHub { + owner = "openai"; + repo = "openai-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; + }; + nativeBuildInputs = with self; [ + setuptools + ]; + propagatedBuildInputs = with self; [ + aiohttp + requests + tqdm + ]; + disabledTestPaths = [ + # Requires a real API key + "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" + # openai: command not found + "openai/tests/test_file_cli.py" + "openai/tests/test_long_examples_validator.py" + ]; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -238,6 +284,16 @@ let }; }); + pydrawise = super.pydrawise.overridePythonAttrs (oldAttrs: rec { + version = "2023.11.0"; + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -321,7 +377,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.12.3"; + hassVersion = "2023.12.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -329,7 +385,7 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.10"; + disabled = python.pythonOlder "3.11"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -339,13 +395,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-pTDYiy9Ux7Rgsf9rXXF3GbaiJkTX5FA/7K2hJtiNOkQ="; + hash = "sha256-XzjsSM0xKxLeuP30u8LReJtmJMbJq+yQ2Pp5xWmNLFw="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-cvsYkuQG4i3GG8VGJ+HGSjdvpSBLzh0BFYQQpoVq4FY="; + hash = "sha256-dea0PacCzCWhMh2gw/kVJHwYCoT7zJ52qTQbHmqcwU8="; }; nativeBuildInputs = with python.pkgs; [ From 84f73ec7b56510d2ff429ab17ca77225537331b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 28 Dec 2023 02:11:12 +0100 Subject: [PATCH 2/2] python311Packages.homeassistant-stubs: 2023.12.3 -> 2023.12.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.12.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index e31c587258b7..0bdac4977ab4 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.12.3"; + version = "2023.12.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-PQZsesdGqeZgQUgO7DkKDcBrWRM/CY8giPx8cK3531s="; + hash = "sha256-a27PeLEArT87+DOrKZ5rLM5o2T3swzLwY+mBhOtd9dQ="; }; nativeBuildInputs = [