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

Conflicts:
	pkgs/development/python-modules/bundlewrap/default.nix
	pkgs/development/python-modules/coverage/default.nix
	pkgs/development/python-modules/h5netcdf/default.nix
	pkgs/development/python-modules/hypothesis/default.nix
	pkgs/development/python-modules/numba/default.nix
	pkgs/development/python-modules/optype/default.nix
	pkgs/development/python-modules/setuptools-git-versioning/default.nix
	pkgs/development/python-modules/sphinx/default.nix

pkgs/development/interpreters/python/cpython/default.nix

@@ -362,19 +362,13 @@ stdenv.mkDerivation (finalAttrs: {
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
   ]
-  ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
-    # Stop checking for TCL/TK in global macOS locations
-    ./3.9/darwin-tcl-tk.patch
-  ]
   ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
     # Fix for http://bugs.python.org/issue1222585
     # Upstream distutils is calling C compiler to compile C++ code, which
     # only works for GCC and Apple Clang. This makes distutils to call C++
     # compiler when needed.
     (
-      if pythonAtLeast "3.7" && pythonOlder "3.11" then
-        ./3.7/python-3.x-distutils-C++.patch
-      else if pythonAtLeast "3.11" then
+      if pythonAtLeast "3.11" then
         ./3.11/python-3.x-distutils-C++.patch
       else
         fetchpatch {
@@ -794,11 +788,6 @@ stdenv.mkDerivation (finalAttrs: {
       inherit src;
       name = "python${pythonVersion}-${version}-doc";
 
-      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;