Merge staging-next into staging

2023-11-09 12:01:36 +00:00
parent 6247bd08f7 2d73797da4
commit 5725d489f3
39 changed files with 802 additions and 839 deletions
@@ -133,6 +133,11 @@ let

    ] ++ lib.optionals (x11Support && stdenv.isDarwin) [
      ./use-correct-tcl-tk-on-darwin.patch
+
+    ] ++ lib.optionals stdenv.isDarwin [
+      # Fix darwin build https://bugs.python.org/issue34027
+      ../3.7/darwin-libutil.patch
+
    ] ++ lib.optionals stdenv.isLinux [

      # Disable the use of ldconfig in ctypes.util.find_library (since