Matt Leon 2024-06-01 23:39:28 -04:00 committed by Martin Weinelt
parent 631cc4c158
commit 4f414748bc
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 25 additions and 12 deletions

View File

@ -34,13 +34,13 @@
let
paaCerts = stdenvNoCC.mkDerivation rec {
pname = "matter-server-paa-certificates";
version = "1.2.0.1";
version = "1.3.0.0";
src = fetchFromGitHub {
owner = "project-chip";
repo = "connectedhomeip";
rev = "refs/tags/v${version}";
hash = "sha256-p3P0n5oKRasYz386K2bhN3QVfN6oFndFIUWLEUWB0ss=";
hash = "sha256-5MI6r0KhSTzolesTQ8YWeoko64jFu4jHfO5KOOKpV0A=";
};
installPhase = ''
@ -56,7 +56,7 @@ in
buildPythonPackage rec {
pname = "python-matter-server";
version = "5.10.0";
version = "6.0.1";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -65,7 +65,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-rfpGclSgCBTxlTgVqgNz3ixoldB9M+6mLmogkNDDdWs=";
hash = "sha256-Ou2bNEDsN8yIslkf4Rf4UrMrcMxTBND/hBtEU1nM8a0=";
};
patches = [

View File

@ -1,3 +1,13 @@
From f45cf9898f2e5a3a4c2b73a9ed84c4a037a85a1e Mon Sep 17 00:00:00 2001
From: Matt Leon <ml@mattleon.com>
Date: Sat, 1 Jun 2024 23:28:41 -0400
Subject: [PATCH] Symlink PAA root certificates to nix store
---
matter_server/server/const.py | 2 ++
matter_server/server/helpers/paa_certificates.py | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
index 8cca3cf..43f02f5 100644
--- a/matter_server/server/const.py
@ -12,19 +22,19 @@ index 8cca3cf..43f02f5 100644
.parent.resolve()
.parent.resolve()
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
index e530838..fdd6025 100644
index de60c78..185e54c 100644
--- a/matter_server/server/helpers/paa_certificates.py
+++ b/matter_server/server/helpers/paa_certificates.py
@@ -64,6 +64,8 @@ async def fetch_dcl_certificates(
fetch_production_certificates: bool = True,
@@ -105,6 +105,8 @@ async def fetch_dcl_certificates(
base_url: str,
) -> int:
"""Fetch DCL PAA Certificates."""
+ return 0
+
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
fetch_count: int = 0
base_urls = set()
@@ -124,6 +126,8 @@ async def fetch_dcl_certificates(
try:
@@ -151,6 +153,8 @@ async def fetch_dcl_certificates(
async def fetch_git_certificates(paa_root_cert_dir: Path) -> int:
"""Fetch Git PAA Certificates."""
@ -33,12 +43,15 @@ index e530838..fdd6025 100644
fetch_count = 0
LOGGER.info("Fetching the latest PAA root certificates from Git.")
@@ -159,6 +163,8 @@ async def fetch_certificates(
@@ -185,6 +189,8 @@ async def fetch_certificates(
fetch_production_certificates: bool = True,
) -> int:
"""Fetch PAA Certificates."""
+ return 0
+
loop = asyncio.get_running_loop()
paa_root_cert_dir_version = paa_root_cert_dir / ".version"
if not paa_root_cert_dir.is_dir():
--
2.44.1