From 03e8aabf24b778310453f679d0722e7b79b9d268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Dec 2025 09:44:42 -0800 Subject: [PATCH] python3Packages.granian: 2.5.6 -> 2.6.0 Diff: https://github.com/emmett-framework/granian/compare/v2.5.6...v2.6.0 Changelog: https://github.com/emmett-framework/granian/releases/tag/v2.6.0 --- .../development/python-modules/granian/default.nix | 12 +++++++++--- .../python-modules/granian/no-alloc.patch | 14 +++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 5bbceb734299..2d0a95898814 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "granian"; - version = "2.5.6"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-XSDBSl7QWqIN5u48z4H5yPHR+ltRmmmrP0JSmvcCcsA="; + hash = "sha256-Jj75ycr9Y0aCTP5YGzd6um/7emWKqqegUDB7HpTfTcM="; }; # Granian forces a custom allocator for all the things it runs, @@ -39,7 +39,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-zQAHJcBWNx5IT/t2wtm7UeOfVNnvfowcp137TePnwiM="; + hash = "sha256-Q7BWwvkK5rRuhVobxW4qXLo6tnusOaQYN8mBoNVoulw="; }; nativeBuildInputs = with rustPlatform; [ @@ -79,6 +79,12 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/" ]; + disabledTests = [ + # SSLCertVerificationError: certificate verify failed: certificate has expired + "test_asgi_ws_scope" + "test_rsgi_ws_scope" + ]; + pythonImportsCheck = [ "granian" ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/development/python-modules/granian/no-alloc.patch b/pkgs/development/python-modules/granian/no-alloc.patch index 1d0b4456a828..28fff30c74f0 100644 --- a/pkgs/development/python-modules/granian/no-alloc.patch +++ b/pkgs/development/python-modules/granian/no-alloc.patch @@ -1,26 +1,26 @@ diff --git a/Cargo.toml b/Cargo.toml -index cbf1cdb..e819e14 100644 +index c7d1647..d5710bd 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -41,7 +41,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] } +@@ -41,7 +41,6 @@ hyper = { version = "=1.8", features = ["http1", "http2", "server"] } hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] } itertools = "0.14" log = "0.4" --mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls"], optional = true } +-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls", "v3"], optional = true } mime_guess = "=2.0" pem = "=3.0" percent-encoding = "=2.3" -@@ -52,7 +51,6 @@ pyo3-log = "=0.12" +@@ -52,7 +51,6 @@ pyo3-log = { version = "=0.13", git = "https://github.com/gi0baro/pyo3-log.git", rustls-pemfile = "2.2" socket2 = { version = "=0.6", features = ["all"] } - sysinfo = "=0.36" + sysinfo = "=0.37" -tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"], optional = true } - tls-listener = { version = "=0.11", features = ["rustls-ring"] } + tls-listener = { version = "=0.11", git = "https://github.com/gi0baro/tls-listener.git", branch = "0.11.x", features = ["rustls-ring", "rustls-tls12"] } tokio = { version = "1.45", features = ["full"] } tokio-stream = "0.1" @@ -62,10 +60,6 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] } [build-dependencies] - pyo3-build-config = "=0.25" + pyo3-build-config = "=0.27" -[features] -jemalloc = ["dep:tikv-jemallocator"]