python311: 3.11.0b1 -> 3.11.0b3

https://www.python.org/downloads/release/python-3110b2/
https://pythoninsider.blogspot.com/2022/05/python-3110b2-is-now-available.html

With updated darwin-libutil.patch provided by Randy Eckenrode.

Co-Authored-By: Randy Eckenrode <randy@largeandhighquality.com>
main
Martin Weinelt 2 years ago
parent 85dfb11907
commit a5c5302ddd
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
  1. 13
      pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch
  2. 2
      pkgs/development/interpreters/python/cpython/default.nix
  3. 4
      pkgs/development/interpreters/python/default.nix

@ -0,0 +1,13 @@
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 40229bce0f..3cc604930e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid)
#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif /* HAVE_UTMP_H */
-#elif defined(HAVE_LIBUTIL_H)
+#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__)
#include <libutil.h>
#elif defined(HAVE_UTIL_H)
#include <util.h>

@ -232,6 +232,8 @@ in with passthru; stdenv.mkDerivation {
] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [
# Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch
] ++ optionals (pythonAtLeast "3.11") [
./3.11/darwin-libutil.patch
] ++ optionals (pythonOlder "3.8") [
# Backport from CPython 3.8 of a good list of tests to run for PGO.
(

@ -199,9 +199,9 @@ in {
major = "3";
minor = "11";
patch = "0";
suffix = "b1";
suffix = "b3";
};
sha256 = "sha256-3MrJsD3T/lzRC8VHV56wvoGh2JcewqhmsD3sU5H1rSU=";
sha256 = "sha256-ybmfUxXqMPjp/LzmgHo3Oeh1SA0pEk5tmUD2+ry3yQI=";
inherit (darwin) configd;
inherit passthruFun;
};

Loading…
Cancel
Save