From a20c578c437c187b26f5c681e2c708acaf9a75ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 6 Jun 2026 21:27:59 -0700
Subject: [PATCH 1/2] python3Packages.zigpy-zboss: 1.2.0 -> 2.0.0

Diff: https://github.com/kardia-as/zigpy-zboss/compare/v1.2.0...v2.0.0

Changelog: https://github.com/kardia-as/zigpy-zboss/releases/tag/v2.0.0
---
 .../python-modules/zigpy-zboss/default.nix    | 46 +++----------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix
index a1090a5ddc14..7bc825ffb50f 100644
--- a/pkgs/development/python-modules/zigpy-zboss/default.nix
+++ b/pkgs/development/python-modules/zigpy-zboss/default.nix
@@ -2,12 +2,12 @@
   buildPythonPackage,
   coloredlogs,
   fetchFromGitHub,
-  fetchpatch,
   jsonschema,
   lib,
-  pytest-asyncio_0,
+  pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
+  serialx,
   setuptools,
   voluptuous,
   zigpy,
@@ -15,39 +15,22 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zboss";
-  version = "1.2.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kardia-as";
     repo = "zigpy-zboss";
     tag = "v${version}";
-    hash = "sha256-T2R291GeFIsnDRI1tAydTlLamA3LF5tKxKFhPtcEUus=";
+    hash = "sha256-mVOuBy/uf4NsWqSfpL/ETLMnUDF5H8x1n8XoNjH5DNY=";
   };
 
-  patches = [
-    # https://github.com/kardia-as/zigpy-zboss/pull/66
-    (fetchpatch {
-      name = "replace-async-timeout-with-asyncio-timeout.patch";
-      url = "https://github.com/kardia-as/zigpy-zboss/commit/91688873ddbcd0c2196f0da69a857b2e2bec75a6.patch";
-      excludes = [ "setup.cfg" ];
-      hash = "sha256-aC0+FbbtuHDW3ApJDnTG3TUeNWhzecEYVuiSOik03uU=";
-    })
-    (fetchpatch {
-      # https://github.com/kardia-as/zigpy-zboss/pull/67
-      name = "replace-pyserial-asyncio-with-pyserial-asyncio-fast.patch";
-      url = "https://github.com/kardia-as/zigpy-zboss/commit/d44ceb537dc16ce020f8c60a0ff35e88672f3455.patch";
-      hash = "sha256-aXWRtBLDr9NLIMNK/xtsYuy/hEB2zHU3YYcRKbguTTo=";
-    })
-  ];
-
-  pythonRemoveDeps = [ "async_timeout" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     coloredlogs
     jsonschema
+    serialx
     voluptuous
     zigpy
   ];
@@ -55,28 +38,11 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "zigpy_zboss" ];
 
   nativeCheckInputs = [
-    pytest-asyncio_0
+    pytest-asyncio
     pytest-mock
     pytestCheckHook
   ];
 
-  disabledTestPaths = [
-    # AttributeError: 'Ledvance' object has no attribute 'get'
-    "tests/application/test_connect.py"
-    "tests/application/test_join.py"
-    "tests/application/test_requests.py"
-    "tests/application/test_startup.py"
-    "tests/application/test_zdo_requests.py"
-    "tests/application/test_zigpy_callbacks.py"
-    # This hasn't been updated in 2 years, and we're getting new failing tests. Best I can do for now is disable them.
-    # If this recieves an update, please give reenabling these tests a try.
-    "tests/api/test_listeners.py"
-    "tests/api/test_request.py"
-    "tests/api/test_response.py"
-    "tests/api/test_connect.py"
-    "tests/test_uart.py"
-  ];
-
   meta = {
     changelog = "https://github.com/kardia-as/zigpy-zboss/releases/tag/v${version}";
     description = "Library for zigpy which communicates with Nordic nRF52 radios";

From 7779537bd95803756812ae08bac71dae83d37289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 6 Jun 2026 21:30:58 -0700
Subject: [PATCH 2/2] python3Packages.zigpy-zboss: use finalAttrs

---
 pkgs/development/python-modules/zigpy-zboss/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix
index 7bc825ffb50f..6bec028b7cc2 100644
--- a/pkgs/development/python-modules/zigpy-zboss/default.nix
+++ b/pkgs/development/python-modules/zigpy-zboss/default.nix
@@ -13,7 +13,7 @@
   zigpy,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "zigpy-zboss";
   version = "2.0.0";
   pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kardia-as";
     repo = "zigpy-zboss";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mVOuBy/uf4NsWqSfpL/ETLMnUDF5H8x1n8XoNjH5DNY=";
   };
 
@@ -44,10 +44,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/kardia-as/zigpy-zboss/releases/tag/v${version}";
+    changelog = "https://github.com/kardia-as/zigpy-zboss/releases/tag/${finalAttrs.src.tag}";
     description = "Library for zigpy which communicates with Nordic nRF52 radios";
     homepage = "https://github.com/kardia-as/zigpy-zboss";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})