Merge staging-next into staging

2024-03-23 12:01:37 +00:00
parent 4dcc3c7ed5 bdc39d2059
commit 97f05fe383
30 changed files with 1201 additions and 1311 deletions
@@ -610,6 +610,14 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
      inherit src;
      name = "python${pythonVersion}-${version}-doc";

+      patches = optionals (pythonAtLeast "3.9" && pythonOlder "3.10") [
+        # https://github.com/python/cpython/issues/98366
+        (fetchpatch {
+          url = "https://github.com/python/cpython/commit/5612471501b05518287ed61c1abcb9ed38c03942.patch";
+          hash = "sha256-p41hJwAiyRgyVjCVQokMSpSFg/VDDrqkCSxsodVb6vY=";
+        })
+      ];
+
      dontConfigure = true;

      dontBuild = true;