Merge master into staging-next

2026-07-19 23:21:27 +00:00 · 2025-02-17 00:15:35 +00:00
parent cef55c8842 f16bb6e46d
commit fc7fa5f568
104 changed files with 5116 additions and 5201 deletions
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -632,6 +632,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
        })
      ];

+      postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") ''
+        substituteInPlace Doc/tools/extensions/pyspecific.py \
+          --replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator"
+      '';
+
      dontConfigure = true;

      dontBuild = true;