From 9dcea72b22ffcb9dac2f17b18b6c9cb96c66ce39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 08:58:36 -0800 Subject: [PATCH 1/8] buildHomeAssistantComponent: run manifestRequirementsCheckHook independently of checkPhase --- .../servers/home-assistant/build-custom-component/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 9a49355b2320..8d249bfa199c 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -41,13 +41,13 @@ home-assistant.python.pkgs.buildPythonPackage ( runHook postInstall ''; - nativeCheckInputs = + nativeBuildInputs = with home-assistant.python.pkgs; [ manifestRequirementsCheckHook packaging ] - ++ (args.nativeCheckInputs or [ ]); + ++ (args.nativeBuildInputs or [ ]); passthru = { isHomeAssistantComponent = true; From 141ca3bb3040d5cb79fa7529ad4d696d8f8495f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:38:03 -0800 Subject: [PATCH 2/8] python3Packages.pymitsubishi: fix src hash --- pkgs/development/python-modules/pymitsubishi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 82ab38deb2ad..4e42f014492b 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-QjHMIzl2VV1S8tNWsFLgLDNX6/0wN9FeIJIo5KgkDVE="; + hash = "sha256-frqyAXAP2O8TZzXx5ephcLSLJA9p0P74KJrPoSKPYYo="; }; build-system = [ setuptools ]; From f20ce616a182bdd78285b6658fa7efbdf38f907d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:32:33 -0800 Subject: [PATCH 3/8] home-assistant-custom-components.mitsubishi: 0.4.0 -> 0.4.2 Diff: https://github.com/pymitsubishi/homeassistant-mitsubishi/compare/v0.4.0...v0.4.2 Changelog: https://github.com/pymitsubishi/homeassistant-mitsubishi/releases/tag/v0.4.2 --- .../home-assistant/custom-components/mitsubishi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index 8fd8dcde5d3c..193d4fa377f9 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "pymitsubishi"; domain = "mitsubishi"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "homeassistant-mitsubishi"; tag = "v${version}"; - hash = "sha256-VEV+HOzXrxX2rsStjwXD4ZWclP2oF6zZHv0MuzL8DE4="; + hash = "sha256-c1KnFpRK5dH7ZGsDuJD6Awa0xhxYYZxC4zCjoRdpOns="; }; dependencies = [ From ea4c74dc07a9e2700f7a0dff1469f00843bff2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:44:12 -0800 Subject: [PATCH 4/8] home-assistant-custom-components.rct_power: fix version --- .../home-assistant/custom-components/rct_power/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix index c9d04886b0df..3096d8ba67cf 100644 --- a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix +++ b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix @@ -8,12 +8,12 @@ buildHomeAssistantComponent rec { owner = "weltenwort"; domain = "rct_power"; - version = "v0.14.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "weltenwort"; repo = "home-assistant-rct-power-integration"; - tag = version; + tag = "v${version}"; hash = "sha256-wM66MyRhBsMfUr+KlqV4jSuXcnKfW0fkbDAyuU2crsc="; }; From 4c8110ce98feb299c5b1dbae27b152fd79c4a1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:45:32 -0800 Subject: [PATCH 5/8] home-assistant-custom-components.rct_power: set ignoreVersionRequirement --- .../home-assistant/custom-components/rct_power/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix index 3096d8ba67cf..d22d017e53c2 100644 --- a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix +++ b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix @@ -21,6 +21,11 @@ buildHomeAssistantComponent rec { rctclient ]; + ignoreVersionRequirement = [ + # rctclient 0.0.4 was never published on PyPI + "rctclient" + ]; + doCheck = false; # no tests meta = with lib; { From fa5cf3e5ea64e96c75235fb18627d7d2f5ba917a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:47:52 -0800 Subject: [PATCH 6/8] buildHomeAssistantComponent: fix typo in check_manifest.py --- .../home-assistant/build-custom-component/check_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py index c2a41584effc..7091f49800af 100644 --- a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py +++ b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -68,7 +68,7 @@ def main(args): # At least one manifest should match the component name ok &= any(check_derivation_name(manifest) for manifest in manifests) - # All requirements need to match, use `ignoreRequirementVersion` to ignore too strict version constraints + # All requirements need to match, use `ignoreVersionRequirement` to ignore too strict version constraints ok &= all( check_requirements(manifest, args.ignore_version_requirement) for manifest in manifests From fa1b0614f482a2f0d101e51f41a94be459ff28d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:49:42 -0800 Subject: [PATCH 7/8] home-assistant-custom-components.volkswagen_we_connect_id: drop Development on the integration has been discontinued. --- .../volkswagen_we_connect_id/package.nix | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix deleted file mode 100644 index 2077213c1ed3..000000000000 --- a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - ascii-magic, - buildHomeAssistantComponent, - fetchFromGitHub, - lib, - weconnect, -}: - -buildHomeAssistantComponent rec { - owner = "mitch-dc"; - domain = "volkswagen_we-connect_id"; - version = "0.2.6"; - - src = fetchFromGitHub { - inherit owner; - repo = "volkswagen_we_connect_id"; - tag = "v${version}"; - hash = "sha256-f5guxLE93QtTPV1zw1313bzF521pVr0vsUa3hzcRmJo="; - }; - - dependencies = [ - ascii-magic - weconnect - ]; - - # upstream has no tests - doCheck = false; - - meta = { - changelog = "https://github.com/mitch-dc/volkswagen_we_connect_id/releases/tag/v${version}"; - description = "Statistics from the Volkswagen ID API"; - homepage = "https://github.com/mitch-dc/volkswagen_we_connect_id"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} From 8065f9ec38a47b9f8f77901272159f47a3ed1237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 2 Dec 2025 09:56:10 -0800 Subject: [PATCH 8/8] python3Packages.pymitsubishi: make sure pyproject.toml specifies the correct version --- pkgs/development/python-modules/pymitsubishi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 4e42f014492b..181e2a716eeb 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { hash = "sha256-frqyAXAP2O8TZzXx5ephcLSLJA9p0P74KJrPoSKPYYo="; }; + postPatch = '' + # make sure pyproject.toml specifies the correct version + grep -qF 'version = "${version}"' pyproject.toml + ''; + build-system = [ setuptools ]; dependencies = [