python313Packages.aiohomematic: init at 2025.8.6, home-assistant-custom-components.homematicip_local: 1.85.1 -> 1.85.2, python313Packages.hahomematic: remove (#434111)

pkgs/development/python-modules/aiohomematic/default.nix

@@ -0,0 +1,65 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  freezegun,
+  orjson,
+  pydevccu,
+  pytest-asyncio,
+  pytest-socket,
+  pytestCheckHook,
+  python-slugify,
+  setuptools,
+  voluptuous,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohomematic";
+  version = "2025.8.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SukramJ";
+    repo = "aiohomematic";
+    tag = version;
+    hash = "sha256-HmcBl+uFjEeyZdilqqTxQ8wrFbDr/8tsh/l0yoVfYJg=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools==80.9.0" "setuptools"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    orjson
+    python-slugify
+    voluptuous
+  ];
+
+  nativeCheckInputs = [
+    freezegun
+    pydevccu
+    pytest-asyncio
+    pytest-socket
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiohomematic" ];
+
+  disabledTests = [
+    # AssertionError: assert 548 == 555
+    "test_central_full"
+  ];
+
+  meta = {
+    description = "Module to interact with HomeMatic devices";
+    homepage = "https://github.com/SukramJ/aiohomematic";
+    changelog = "https://github.com/SukramJ/aiohomematic/blob/${src.tag}/changelog.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/hahomematic/default.nix

@@ -1,73 +0,0 @@
-{
-  lib,
-  aiohttp,
-  buildPythonPackage,
-  fetchFromGitHub,
-  freezegun,
-  orjson,
-  pydevccu,
-  pytest-aiohttp,
-  pytest-socket,
-  pytestCheckHook,
-  python-slugify,
-  pythonOlder,
-  setuptools,
-  voluptuous,
-}:
-
-buildPythonPackage rec {
-  pname = "hahomematic";
-  version = "2025.8.3";
-  pyproject = true;
-
-  disabled = pythonOlder "3.13";
-
-  src = fetchFromGitHub {
-    owner = "SukramJ";
-    repo = "hahomematic";
-    tag = version;
-    hash = "sha256-BztVWvDUDXTgC1uha7grD4hcWJqKcua4UVgy3KivWSI=";
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==80.9.0" "setuptools" \
-  '';
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    aiohttp
-    orjson
-    python-slugify
-    voluptuous
-  ];
-
-  nativeCheckInputs = [
-    freezegun
-    pydevccu
-    pytest-aiohttp
-    pytest-socket
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # AssertionError: assert 548 == 555
-    "test_central_full"
-  ];
-
-  pythonImportsCheck = [ "hahomematic" ];
-
-  meta = with lib; {
-    description = "Python module to interact with HomeMatic devices";
-    homepage = "https://github.com/SukramJ/hahomematic";
-    changelog = "https://github.com/SukramJ/hahomematic/blob/${src.tag}/changelog.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      dotlambda
-      fab
-    ];
-  };
-}

pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix

@@ -2,20 +2,20 @@
   lib,
   buildHomeAssistantComponent,
   fetchFromGitHub,
-  hahomematic,
+  aiohomematic,
   home-assistant,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.85.1";
+  version = "1.85.2";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-6dZKr65uGW67pExyhIYDu+3U7QmCVU9CaeUcBl2XPm4=";
+    hash = "sha256-uhSpWD7L1T345PjfAgywdscbHKVLKlzUVCG88HaKAac=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildHomeAssistantComponent rec {
   '';
 
   dependencies = [
-    hahomematic
+    aiohomematic
   ];
 
   meta = {

pkgs/top-level/python-aliases.nix

@@ -323,6 +323,7 @@ mapAliases ({
   guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
   ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
   HAP-python = hap-python; # added 2021-06-01
+  hahomematic = throw "hahomematic has been superseded by aiohomematic"; # added 2025-08-16
   hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13
   hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
   hcs_utils = hcs-utils; # added 2024-01-06

pkgs/top-level/python-packages.nix

@@ -290,6 +290,8 @@ self: super: with self; {
 
   aiohomekit = callPackage ../development/python-modules/aiohomekit { };
 
+  aiohomematic = callPackage ../development/python-modules/aiohomematic { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
   aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };
@@ -6425,8 +6427,6 @@ self: super: with self; {
 
   hacking = callPackage ../development/python-modules/hacking { };
 
-  hahomematic = callPackage ../development/python-modules/hahomematic { };
-
   hakuin = callPackage ../development/python-modules/hakuin { };
 
   halide =