Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2022-12-12 18:01:51 +00:00
committed by GitHub
47 changed files with 1422 additions and 311 deletions

View File

@@ -214,7 +214,19 @@ in with passthru; stdenv.mkDerivation {
substituteInPlace setup.py --replace /Library/Frameworks /no-such-path
'';
patches = [
patches = optionals (version == "3.10.9") [
# https://github.com/python/cpython/issues/100160
./3.10/asyncio-deprecation.patch
] ++ optionals (version == "3.11.1") [
# https://github.com/python/cpython/issues/100160
(fetchpatch {
name = "asyncio-deprecation-3.11.patch";
url = "https://github.com/python/cpython/commit/3fae04b10e2655a20a3aadb5e0d63e87206d0c67.diff";
revert = true;
excludes = [ "Misc/NEWS.d/*" ];
sha256 = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY=";
})
] ++ [
# Disable the use of ldconfig in ctypes.util.find_library (since
# ldconfig doesn't work on NixOS), and don't use
# ctypes.util.find_library during the loading of the uuid module