From e20c0f2d0922281837aa257b86f687a290567bbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:23:09 +0100 Subject: [PATCH 01/11] python313Packages.homeassistant-stubs: 2025.2.5 -> 2025.3.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.3.0 --- 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 b62bbb9419df..cea002e1612f 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.2.5"; + version = "2025.3.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-tqg7NHvtKrXJ8+czcWqoaPMLYfskjuoFmSOkhjmnr3g="; + hash = "sha256-4Chn8PRvTERiTQqhp3ScoV6woISvEWHFoohCKzLJCP8="; }; build-system = [ From a4b4eebe8b4cbf8c146a0aae5814aa4936e07e59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:23:53 +0100 Subject: [PATCH 02/11] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.214 -> 0.13.220 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.220/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index e8bae80d8747..3fdec67a3507 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.214"; + version = "0.13.220"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-AbqDLFC/U+zJJF4pc1ovuzwmXLv37ojCpQQIzWUc/70="; + hash = "sha256-p/pC0dgKRVPlu3kOiSmeGhbfRW7cPm5W0Lr38XWlcnQ="; }; build-system = [ setuptools ]; From 667b1f61ff7a9b5691a44d50d796e76c9b16ad71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:38:47 +0100 Subject: [PATCH 03/11] home-assistant-custom-components.daikin_onecta: 4.2.2 -> 4.2.3 https://github.com/jwillemsen/daikin_onecta/tag/v4.2.3 --- .../custom-components/daikin_onecta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index c914a1f02079..be9ae7010515 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-kjFBy+Nq9aQSsmvzWT2Wy/BwMpyd8GdgSXIrp44cMnA="; + hash = "sha256-ylVHgmE6zDLE73KpuIag0iUx77w6ujp3cF/+x2bJiA8="; }; meta = { From 06f80f51080e9f5636ac63c6c0cad13e462bb83e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:39:31 +0100 Subject: [PATCH 04/11] home-assistant-custom-components.localtuya: 2025.3.0 -> 2025.3.1 https://github.com/xZetsubou/hass-localtuya/releases/tag/2025.3.1 --- .../home-assistant/custom-components/localtuya/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix index f713f138c529..f7b0f8a81fe8 100644 --- a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix +++ b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "xZetsubou"; domain = "localtuya"; - version = "2025.3.0"; + version = "2025.3.1"; src = fetchFromGitHub { owner = "xZetsubou"; repo = "hass-localtuya"; rev = version; - hash = "sha256-ZtUK73aj2NKlcanlFZLeL35X1M9CrMLYLW0P0cILdr8="; + hash = "sha256-DZ0TS6vdMDBCYP661GeRm+pAmm387/+/DayIBkeuPQA="; }; meta = with lib; { From 36af8c6fd1008abef74c0d15d33251718364742e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:41:16 +0100 Subject: [PATCH 05/11] home-assistant-custom-components.xiaomi_miot: 1.0.12 -> 1.0.13 https://github.com/al-one/hass-xiaomi-miot/releases/tag/v1.0.13 --- .../home-assistant/custom-components/xiaomi_miot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 011471fda2d0..2229d6259462 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-WU512UnKRHVoflerXK4vs/wJXxaerC1XVhfLN1YPh84="; + hash = "sha256-RjEhmdoImfWcvrQ09wX3WaWS8qKuzL2+2Rrz1BfEFFA="; }; dependencies = [ From 3614af95650422f6ea15b8dc7ff3e25089a2592f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:41:24 +0100 Subject: [PATCH 06/11] home-assistant-custom-components.yoto_ha: 1.23.0 -> 1.23.2 https://github.com/cdnninja/yoto_ha/releases/tag/v1.23.2 --- .../home-assistant/custom-components/yoto_ha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix index c8b3935d34a7..e2259c87ee42 100644 --- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "cdnninja"; domain = "yoto"; - version = "1.23.0"; + version = "1.23.2"; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_ha"; tag = "v${version}"; - hash = "sha256-FB711ofk5BV/U0ZWfa6Q2aheZkzbwxDUfqNDu9wj2aQ="; + hash = "sha256-RErsZGSoBhBGg852znZq6W8oDZmDDoPTZihUBhWCO5w="; }; dependencies = [ From 19fff691ae56eca8b5bfa1b884bc5ac7c8340ec1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:42:26 +0100 Subject: [PATCH 07/11] home-assistant-custom-lovelace-modules.clock-weather-card: 2.8.9 -> 2.8.10 https://github.com/pkissling/clock-weather-card/blob/v2.8.10/CHANGELOG.md --- .../custom-lovelace-modules/clock-weather-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix index 09743011c733..0e651743dbe0 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix @@ -9,18 +9,18 @@ }: stdenvNoCC.mkDerivation rec { pname = "clock-weather-card"; - version = "2.8.9"; + version = "2.8.10"; src = fetchFromGitHub { owner = "pkissling"; repo = "clock-weather-card"; tag = "v${version}"; - hash = "sha256-7b0U6HelWLoCvkJrqzRbRyDnl0odi6OYYEp0sUOYnoU="; + hash = "sha256-ZmqtvA6kRkqkoRCBerLZXqRB1wwTF0jrc+KfigaE7Pw="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-9MFEJQ9JYUjded6sdDcF/kB+ZdGE6z4MZOzFk1Qb3vo="; + hash = "sha256-Z9UZHsmaRjaf7fIDYhNmlLU2T1l1hlFKvyEahPK3Y3E="; }; nativeBuildInputs = [ From d663db8ad8673bc9ddd1d6664dd7b7f98931607e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:55:33 +0100 Subject: [PATCH 08/11] home-assistant.python.pkgs.hass-web-proxy-lib: init at 0.0.7 --- pkgs/servers/home-assistant/default.nix | 1 + .../hass-web-proxy-lib/default.nix | 72 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 38604c3516be..59ace4cff11a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -354,6 +354,7 @@ let }); # internal python packages only consumed by home-assistant itself + hass-web-proxy-lib = self.callPackage ./python-modules/hass-web-proxy-lib { }; home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; homeassistant = self.toPythonModule home-assistant; diff --git a/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix b/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix new file mode 100644 index 000000000000..0cb298e48d68 --- /dev/null +++ b/pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix @@ -0,0 +1,72 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fetchpatch2, + + # build-system + poetry-core, + + # dependencies + aiohttp, + + # tests + home-assistant, + pytest-aiohttp, + pytest-cov-stub, + pytest-homeassistant-custom-component, + pytest-timeout, + pytestCheckHook, + + # reverse dependencies + home-assistant-custom-components, +}: + +buildPythonPackage rec { + pname = "hass-web-proxy-lib"; + version = "0.0.7"; + pyproject = true; + + # no tags on git + src = fetchPypi { + pname = "hass_web_proxy_lib"; + inherit version; + hash = "sha256-bhz71tNOpZ+4tSlndS+UbC3w2WW5+dAMtpk7TnnFpuQ="; + }; + + patches = [ + (fetchpatch2 { + name = "add-missing-build-system.patch"; + url = "https://github.com/dermotduffy/hass-web-proxy-lib/commit/0eed7a57f503fc552948a45e7f490ddaff711896.patch"; + hash = "sha256-ccOdhA0NhlTmdA51sNdB357Xh13E4PsLlvUTU4GQ9jk="; + }) + ]; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + home-assistant + pytest-aiohttp + pytest-cov-stub + pytest-homeassistant-custom-component + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hass_web_proxy_lib" + ]; + + passthru.tests = { + inherit (home-assistant-custom-components) frigate; + }; + + meta = { + description = "A library to proxy web traffic through Home Assistant integrations"; + homepage = "https://github.com/dermotduffy/hass-web-proxy-lib"; + license = lib.licenses.mit; + maintainers = home-assistant-custom-components.frigate.meta.maintainers; + }; +} From ff5268a8298d6a07687f75784b1db96ed325c338 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 04:30:21 +0100 Subject: [PATCH 09/11] home-assistant-custom-components.frigate: 5.4.0 -> 5.8.0 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.4.1 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.5.0 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.5.1 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.6.0 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.7.0 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.8.0 --- .../custom-components/frigate/package.nix | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index 11a7d1fcd93a..ddd69f9f4df7 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -2,25 +2,55 @@ lib, fetchFromGitHub, buildHomeAssistantComponent, - pytz, + + # dependencies + hass-web-proxy-lib, + + # tests + homeassistant, + pytest-aiohttp, + pytest-cov-stub, + pytest-homeassistant-custom-component, + pytest-timeout, + pytestCheckHook, }: buildHomeAssistantComponent rec { owner = "blakeblackshear"; domain = "frigate"; - version = "5.4.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "blakeblackshear"; repo = "frigate-hass-integration"; - rev = "v${version}"; - hash = "sha256-V2Y+xUAA/Lu7u82WUlUI5CFi9SGWe6ocVQtlXeVg2ZA="; + tag = "v${version}"; + hash = "sha256-sQgi3F44eT/iL3cE9YuKyjJmE4nZM+OcwirUyl3maGo="; }; - dependencies = [ pytz ]; + dependencies = [ hass-web-proxy-lib ]; dontBuild = true; + nativeCheckInputs = + [ + homeassistant + pytest-aiohttp + pytest-cov-stub + pytest-homeassistant-custom-component + pytest-timeout + pytestCheckHook + ] + ++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs) + ++ (homeassistant.getPackages "stream" homeassistant.python.pkgs); + + disabledTests = [ + # uses deprecated and removed constants + # https://github.com/blakeblackshear/frigate-hass-integration/issues/860 + "test_duplicate" + "test_options_advanced" + "test_options" + ]; + meta = with lib; { description = "Provides Home Assistant integration to interface with a separately running Frigate service"; homepage = "https://github.com/blakeblackshear/frigate-hass-integration"; From 44bf7f8725bd657606e89de44dd53b02c941332c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 04:37:03 +0100 Subject: [PATCH 10/11] home-assistant-custom-components.smartir: 1.17.9 -> 1.18.0 As upstream is not responding to the patch that migrates version comparison to the packaging library, let's go with distutils for now, so we don't have to update the patch. --- .../custom-components/smartir/package.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/smartir/package.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix index 6735dd530676..dcbe0491b049 100644 --- a/pkgs/servers/home-assistant/custom-components/smartir/package.nix +++ b/pkgs/servers/home-assistant/custom-components/smartir/package.nix @@ -2,36 +2,26 @@ lib, buildHomeAssistantComponent, fetchFromGitHub, - fetchpatch, aiofiles, - broadlink, + distutils, nix-update-script, }: buildHomeAssistantComponent rec { owner = "smartHomeHub"; domain = "smartir"; - version = "1.17.9"; + version = "1.18.0"; src = fetchFromGitHub { owner = "smartHomeHub"; repo = "SmartIR"; - rev = version; - hash = "sha256-E6TM761cuaeQzlbjA+oZ+wt5HTJAfkF2J3i4P1Wbuic="; + tag = version; + hash = "sha256-Sy1wxVUApKWm9TlDia2Gwd+mIi7WbDkzJrAtyb0tTbM="; }; - patches = [ - # Replace distutils.version.StrictVersion with packaging.version.Version - # https://github.com/smartHomeHub/SmartIR/pull/1250 - (fetchpatch { - url = "https://github.com/smartHomeHub/SmartIR/commit/1ed8ef23a8f7b9dcae75721eeab8d5f79013b851.patch"; - hash = "sha256-IhdnTDtUa7mS+Vw/+BqfqWIKK4hbshbVgJNjfKjgAvI="; - }) - ]; - dependencies = [ aiofiles - broadlink + distutils ]; dontBuild = true; From d4a1f41003ed01e7013a8e9e2ed6d1c53631a3f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 04:53:33 +0100 Subject: [PATCH 11/11] home-assistant-lovelace-modules.advanced-camera-card: init at 7.3.2 --- .../advanced-camera-card/package.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix new file mode 100644 index 000000000000..f17148a7df09 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchzip, +}: + +stdenv.mkDerivation rec { + pname = "advanced-camera-card"; + version = "7.3.2"; + + src = fetchzip { + url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; + hash = "sha256-N9G96yGas1hrB2zpUPrB+md7Nz2vg7/2NhyqNjFBlxM="; + }; + + # TODO: build from source once yarn berry support lands in nixpkgs + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -d $out + install -m0644 *.js $out/ + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/dermotduffy/advanced-camera-card/releases/tag/v${version}"; + description = "A comprehensive camera card for Home Assistant"; + homepage = "https://github.com/dermotduffy/advanced-camera-card"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}