mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-26 08:48:38 +03:00
Merge pull request #300232 from leonm1/python-matter-server-5.9.0
python-matter-server: 5.8.1 -> 5.9.0
This commit is contained in:
commit
38baa03829
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "home-assistant-chip-clusters";
|
pname = "home-assistant-chip-clusters";
|
||||||
version = "2024.2.2";
|
version = "2024.3.2";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||||||
pname = "home_assistant_chip_clusters";
|
pname = "home_assistant_chip_clusters";
|
||||||
dist = "py3";
|
dist = "py3";
|
||||||
python = "py3";
|
python = "py3";
|
||||||
hash = "sha256-OWDOJfVQJSJFng5xAQqBNpqB0nXnYVCTq1MwyPtwfIM=";
|
hash = "sha256-Imdpqy7m81oxfkzj+82afSX9juK/SOCBIMoaPjK8G+Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "home-assistant-chip-core";
|
pname = "home-assistant-chip-core";
|
||||||
version = "2024.2.2";
|
version = "2024.3.2";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -37,11 +37,11 @@ buildPythonPackage rec {
|
|||||||
system = {
|
system = {
|
||||||
"aarch64-linux" = {
|
"aarch64-linux" = {
|
||||||
name = "aarch64";
|
name = "aarch64";
|
||||||
hash = "sha256-lo6upkkZYQCtggNU+4/S/JTUqJnAWaWFA6NTt4C2gEM=";
|
hash = "sha256-li+fmEikVnTAkgQnoiWjoZaVRwGRadTYuQySR5s8VB4=";
|
||||||
};
|
};
|
||||||
"x86_64-linux" = {
|
"x86_64-linux" = {
|
||||||
name = "x86_64";
|
name = "x86_64";
|
||||||
hash = "sha256-VwiIH/PK4fOQCc+KSHXP1VwHVK1gYnmBXTgKDT1Yt58=";
|
hash = "sha256-iUKtAz00qFklTW2ilUPGAWhpqDmnLb6D3Zdy1oHpQl0=";
|
||||||
};
|
};
|
||||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||||
in fetchPypi {
|
in fetchPypi {
|
||||||
|
@ -55,7 +55,7 @@ in
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-matter-server";
|
pname = "python-matter-server";
|
||||||
version = "5.8.1";
|
version = "5.9.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.10";
|
disabled = pythonOlder "3.10";
|
||||||
@ -64,7 +64,7 @@ buildPythonPackage rec {
|
|||||||
owner = "home-assistant-libs";
|
owner = "home-assistant-libs";
|
||||||
repo = "python-matter-server";
|
repo = "python-matter-server";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8=";
|
hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -1,22 +1,21 @@
|
|||||||
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
|
diff --git a/matter_server/server/const.py b/matter_server/server/const.py
|
||||||
index 2a6140b..275353a 100644
|
index 8cca3cf..43f02f5 100644
|
||||||
--- a/matter_server/server/const.py
|
--- a/matter_server/server/const.py
|
||||||
+++ b/matter_server/server/const.py
|
+++ b/matter_server/server/const.py
|
||||||
@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
|
@@ -14,6 +14,8 @@ DATA_MODEL_SCHEMA_VERSION = 6
|
||||||
# and always uses the development subfolder
|
# Keep default location inherited from early version of the Python
|
||||||
# regardless of anything you pass into instantiating the controller
|
# bindings.
|
||||||
# revisit this once matter 1.1 is released
|
DEFAULT_PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
|
||||||
-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = (
|
+ pathlib.Path("@paacerts@"))
|
||||||
+PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@")
|
|
||||||
+(
|
+(
|
||||||
pathlib.Path(__file__)
|
pathlib.Path(__file__)
|
||||||
.parent.resolve()
|
.parent.resolve()
|
||||||
.parent.resolve()
|
.parent.resolve()
|
||||||
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
|
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
|
||||||
index d186be1..d2cef54 100644
|
index e530838..fdd6025 100644
|
||||||
--- a/matter_server/server/helpers/paa_certificates.py
|
--- a/matter_server/server/helpers/paa_certificates.py
|
||||||
+++ b/matter_server/server/helpers/paa_certificates.py
|
+++ b/matter_server/server/helpers/paa_certificates.py
|
||||||
@@ -62,6 +62,8 @@ async def fetch_dcl_certificates(
|
@@ -64,6 +64,8 @@ async def fetch_dcl_certificates(
|
||||||
fetch_production_certificates: bool = True,
|
fetch_production_certificates: bool = True,
|
||||||
) -> int:
|
) -> int:
|
||||||
"""Fetch DCL PAA Certificates."""
|
"""Fetch DCL PAA Certificates."""
|
||||||
@ -25,16 +24,16 @@ index d186be1..d2cef54 100644
|
|||||||
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
|
LOGGER.info("Fetching the latest PAA root certificates from DCL.")
|
||||||
fetch_count: int = 0
|
fetch_count: int = 0
|
||||||
base_urls = set()
|
base_urls = set()
|
||||||
@@ -121,6 +123,8 @@ async def fetch_dcl_certificates(
|
@@ -124,6 +126,8 @@ async def fetch_dcl_certificates(
|
||||||
|
|
||||||
async def fetch_git_certificates() -> int:
|
async def fetch_git_certificates(paa_root_cert_dir: Path) -> int:
|
||||||
"""Fetch Git PAA Certificates."""
|
"""Fetch Git PAA Certificates."""
|
||||||
+ return 0
|
+ return 0
|
||||||
+
|
+
|
||||||
fetch_count = 0
|
fetch_count = 0
|
||||||
LOGGER.info("Fetching the latest PAA root certificates from Git.")
|
LOGGER.info("Fetching the latest PAA root certificates from Git.")
|
||||||
|
|
||||||
@@ -162,6 +166,8 @@ async def fetch_certificates(
|
@@ -159,6 +163,8 @@ async def fetch_certificates(
|
||||||
fetch_production_certificates: bool = True,
|
fetch_production_certificates: bool = True,
|
||||||
) -> int:
|
) -> int:
|
||||||
"""Fetch PAA Certificates."""
|
"""Fetch PAA Certificates."""
|
||||||
@ -42,4 +41,4 @@ index d186be1..d2cef54 100644
|
|||||||
+
|
+
|
||||||
loop = asyncio.get_running_loop()
|
loop = asyncio.get_running_loop()
|
||||||
|
|
||||||
if not PAA_ROOT_CERTS_DIR.is_dir():
|
if not paa_root_cert_dir.is_dir():
|
||||||
|
Loading…
Reference in New Issue
Block a user