From dbde2b65dea9de87e09bf234869717ad141439f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 13:34:32 +0200 Subject: [PATCH 1/6] python-matter-server: include server extra --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f2102cb2dba5..559aa0fddbfa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19653,7 +19653,11 @@ with pkgs; mermerd = callPackage ../development/tools/database/mermerd { }; - python-matter-server = with python3Packages; toPythonApplication python-matter-server; + python-matter-server = with python3Packages; toPythonApplication ( + python-matter-server.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server; + }) + ); minify = callPackage ../development/web/minify { }; From 01f92c3be8c24c6eba5c8bfa6808c454d5f01855 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 13:35:01 +0200 Subject: [PATCH 2/6] python311Packages.home-assistant-chip-clusters: improve import coverage --- .../python-modules/home-assistant-chip-clusters/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index d91b01f52cc90..d112e1e0db48d 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "chip.clusters" + "chip.clusters.ClusterObjects" + "chip.tlv" ]; doCheck = false; # no tests From 3e900ed523806e39c638e070e5d646787a4e42f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 13:35:38 +0200 Subject: [PATCH 3/6] python311Packages.home-assistant-chip-core: fix pep420 namespacing and improve import coverage. --- .../python-modules/home-assistant-chip-core/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index ea6dc79d51d99..84f2e42753480 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -78,12 +78,17 @@ buildPythonPackage rec { pygobject3 ]; + pythonNamespaces = [ + "chip" + "chip.clusters" + ]; + pythonImportsCheck = [ "chip" "chip.ble" - # https://github.com/project-chip/connectedhomeip/pull/24376 - #"chip.configuration" + "chip.configuration" "chip.discovery" + "chip.exceptions" "chip.native" "chip.storage" ]; From 5b438f08c0472f20348fc3c1c8647e9ff939f6b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 25 Oct 2023 13:17:42 +0200 Subject: [PATCH 4/6] python311Packages.home-assistant-chip-core: 2023.6.0 -> 2023.10.1 https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.10.1 --- .../python-modules/home-assistant-chip-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 84f2e42753480..b8b865574f792 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.6.0"; + version = "2023.10.1"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; + hash = "sha256-mffjJtn0LmRz9DOWMMw9soYDDm/M1C5Tdj6YbWHaq2o="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { From 6b365e3b3bbe0e299aa18f7471a805643a1fa413 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 25 Oct 2023 13:18:19 +0200 Subject: [PATCH 5/6] python311Packages.home-assistant-chip-clusters: 2023.6.0 -> 2023.10.1 https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.10.1 --- .../python-modules/home-assistant-chip-clusters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index d112e1e0db48d..b7f08d38d6bfc 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.6.0"; + version = "2023.10.1"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; + hash = "sha256-KI5idrD8SIpzSYopELYWJJaaiAFQzwRwhFBfb4BEw2o="; }; propagatedBuildInputs = [ From f22e146741b128a2140161392f7bc157bb2df641 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 25 Oct 2023 13:20:55 +0200 Subject: [PATCH 6/6] python311Packages.python-matter-server: 3.7.0 -> 4.0.0 https://github.com/home-assistant-libs/python-matter-server/releases/tag/4.0.0 --- .../python-matter-server/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index ccb013d14e548..1c65a6de3220a 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.7.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -38,18 +37,9 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; + hash = "sha256-7MBQo4jzBU/n7gVdGzVHlQl8Vj3OjfK4gk1vhLQQUE0="; }; - patches = [ - # https://github.com/home-assistant-libs/python-matter-server/pull/379 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/home-assistant-libs/python-matter-server/commit/1bbc945634db92ea081051645b03c3d9c358fb15.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools wheel