diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 18:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 18:01:31 +0000 |
| commit | c68d98e9d41f96cf3d591f8d5a7abfdb2b292799 (patch) | |
| tree | be6df5adcc1528f56a1204acff4eaf2cfd1cefb6 /pkgs/development/interpreters/python/cpython/default.nix | |
| parent | 68ba5fd2ed8be749cf1865ed9a71667dfda944a7 (diff) | |
| parent | 4a7eb88e55f80623bb3ea4968ff4600814016ffb (diff) | |
| download | nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.gz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.bz2 nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.lz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.xz nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.tar.zst nixlib-c68d98e9d41f96cf3d591f8d5a7abfdb2b292799.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters/python/cpython/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 4e60b15ba4cb..839ac99a7574 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -302,9 +302,12 @@ in with passthru; stdenv.mkDerivation { ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. ./3.7/fix-finding-headers-when-cross-compiling.patch - ] ++ optionals stdenv.hostPlatform.isLoongArch64 [ + ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch + ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ + # backport fix for https://github.com/python/cpython/issues/95855 + ./platform-triplet-detection.patch ] ++ optionals (stdenv.hostPlatform.isMinGW) (let # https://src.fedoraproject.org/rpms/mingw-python3 mingw-patch = fetchgit { |