gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python312: make portability backport unconditional

Browse Source 
This avoids the maintenance headache associated with conditionally
applied patches, and fixes building for s390.
This commit is contained in:
Alyssa Ross
2024-07-17 12:33:29 +02:00
parent 693bc46d16
commit aba1b58d1f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/cpython/default.nix
+2 -4
View File
@@ -367,10 +367,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
};
in [
"${mingw-patch}/*.patch"
]) ++ optionals (pythonAtLeast "3.12" && (stdenv.hostPlatform != stdenv.buildPlatform) && (
stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV
)) [
# backport fix for various platforms; armv7l, riscv64
]) ++ optionals (pythonAtLeast "3.12") [
# backport fix for various platforms; armv7l, riscv64, s390
# https://github.com/python/cpython/pull/121178
(
if (pythonAtLeast "3.13") then