diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-05 03:14:22 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-15 01:18:26 +0200 |
| commit | a5c5302ddd7b5c62e54a33d56f99bbca50ffd867 (patch) | |
| tree | 14e36ee55f97a29c977a46f378b4786b96dccc2b | |
| parent | 85dfb11907c220c042f1372a2f411520e1efe235 (diff) | |
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>
3 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch new file mode 100644 index 0000000000000..92b846be00022 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch @@ -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> diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 0e126c894a8a2..afd6e999bff54 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -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. ( diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ba9f866877d32..b99a388a0667d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -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; }; |