Merge remote-tracking branch 'origin/master' into staging-next

2026-05-08 09:27:15 +03:00
parent a8754b0b9a 0a8d309190
commit 7a535c8c93
232 changed files with 2966 additions and 1132 deletions
@@ -427,7 +427,7 @@ stdenv.mkDerivation (finalAttrs: {
    # backport fix for https://github.com/python/cpython/issues/95855
    ./platform-triplet-detection.patch
  ]
-  ++ optionals (pythonAtLeast "3.14") [
+  ++ optionals (pythonAtLeast "3.14" && pythonOlder "3.15") [
    # https://github.com/python/cpython/issues/146264
    # https://github.com/python/cpython/pull/146265
    ./3.14/hacl-static-ldeps-for-static-modules.patch
@@ -92,9 +92,9 @@
        major = "3";
        minor = "15";
        patch = "0";
-        suffix = "a8";
+        suffix = "b1";
      };
-      hash = "sha256-KPG2NYYJBC68yBSI7CRWlRn1CAS7B9wjzHB7KBsDHGk=";
+      hash = "sha256-1NUsz6HXJ+9SNfu31w+h26zxC4s3YNtiKHXaBay+Q3w=";
      inherit passthruFun;
    };