treewide: run nixfmt 1.0.0
This commit is contained in:
Wolfgang Walther
@@ -104,113 +104,111 @@ let
|
||||
};
|
||||
|
||||
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
|
||||
patches =
|
||||
[
|
||||
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
|
||||
./search-path.patch
|
||||
patches = [
|
||||
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
|
||||
./search-path.patch
|
||||
|
||||
# Python recompiles a Python if the mtime stored *in* the
|
||||
# pyc/pyo file differs from the mtime of the source file. This
|
||||
# doesn't work in Nix because Nix changes the mtime of files in
|
||||
# the Nix store to 1. So treat that as a special case.
|
||||
./nix-store-mtime.patch
|
||||
# Python recompiles a Python if the mtime stored *in* the
|
||||
# pyc/pyo file differs from the mtime of the source file. This
|
||||
# doesn't work in Nix because Nix changes the mtime of files in
|
||||
# the Nix store to 1. So treat that as a special case.
|
||||
./nix-store-mtime.patch
|
||||
|
||||
# patch python to put zero timestamp into pyc
|
||||
# if DETERMINISTIC_BUILD env var is set
|
||||
./deterministic-build.patch
|
||||
# patch python to put zero timestamp into pyc
|
||||
# if DETERMINISTIC_BUILD env var is set
|
||||
./deterministic-build.patch
|
||||
|
||||
# Fix python bug #27177 (https://bugs.python.org/issue27177)
|
||||
# The issue is that `match.group` only recognizes python integers
|
||||
# instead of everything that has `__index__`.
|
||||
# This bug was fixed upstream, but not backported to 2.7
|
||||
(fetchpatch {
|
||||
name = "re_match_index.patch";
|
||||
url = "https://bugs.python.org/file43084/re_match_index.patch";
|
||||
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
|
||||
})
|
||||
# Fix python bug #27177 (https://bugs.python.org/issue27177)
|
||||
# The issue is that `match.group` only recognizes python integers
|
||||
# instead of everything that has `__index__`.
|
||||
# This bug was fixed upstream, but not backported to 2.7
|
||||
(fetchpatch {
|
||||
name = "re_match_index.patch";
|
||||
url = "https://bugs.python.org/file43084/re_match_index.patch";
|
||||
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
|
||||
})
|
||||
|
||||
# Fix race-condition during pyc creation. Has a slight backwards
|
||||
# incompatible effect: pyc symlinks will now be overridden
|
||||
# (https://bugs.python.org/issue17222). Included in python >= 3.4,
|
||||
# backported in debian since 2013.
|
||||
# https://bugs.python.org/issue13146
|
||||
./atomic_pyc.patch
|
||||
# Fix race-condition during pyc creation. Has a slight backwards
|
||||
# incompatible effect: pyc symlinks will now be overridden
|
||||
# (https://bugs.python.org/issue17222). Included in python >= 3.4,
|
||||
# backported in debian since 2013.
|
||||
# https://bugs.python.org/issue13146
|
||||
./atomic_pyc.patch
|
||||
|
||||
# Backport from CPython 3.8 of a good list of tests to run for PGO.
|
||||
./profile-task.patch
|
||||
# Backport from CPython 3.8 of a good list of tests to run for PGO.
|
||||
./profile-task.patch
|
||||
|
||||
# The workaround is for unittests on Win64, which we don't support.
|
||||
# It does break aarch64-darwin, which we do support. See:
|
||||
# * https://bugs.python.org/issue35523
|
||||
# * https://github.com/python/cpython/commit/e6b247c8e524
|
||||
../3.7/no-win64-workaround.patch
|
||||
# The workaround is for unittests on Win64, which we don't support.
|
||||
# It does break aarch64-darwin, which we do support. See:
|
||||
# * https://bugs.python.org/issue35523
|
||||
# * https://github.com/python/cpython/commit/e6b247c8e524
|
||||
../3.7/no-win64-workaround.patch
|
||||
|
||||
# fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ActiveState/cpython/pull/35/commits/20ea5b46aaf1e7bdf9d6905ba8bece2cc73b05b0.patch";
|
||||
revert = true;
|
||||
hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [
|
||||
./use-correct-tcl-tk-on-darwin.patch
|
||||
# fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ActiveState/cpython/pull/35/commits/20ea5b46aaf1e7bdf9d6905ba8bece2cc73b05b0.patch";
|
||||
revert = true;
|
||||
hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [
|
||||
./use-correct-tcl-tk-on-darwin.patch
|
||||
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
# 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
|
||||
# (since it will do a futile invocation of gcc (!) to find
|
||||
# libuuid, slowing down program startup a lot).
|
||||
./no-ldconfig.patch
|
||||
# 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
|
||||
# (since it will do a futile invocation of gcc (!) to find
|
||||
# libuuid, slowing down program startup a lot).
|
||||
./no-ldconfig.patch
|
||||
|
||||
# Fix ctypes.util.find_library with gcc10.
|
||||
./find_library-gcc10.patch
|
||||
# Fix ctypes.util.find_library with gcc10.
|
||||
./find_library-gcc10.patch
|
||||
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isCygwin [
|
||||
./2.5.2-ctypes-util-find_library.patch
|
||||
./2.5.2-tkinter-x11.patch
|
||||
./2.6.2-ssl-threads.patch
|
||||
./2.6.5-export-PySignal_SetWakeupFd.patch
|
||||
./2.6.5-FD_SETSIZE.patch
|
||||
./2.6.5-ncurses-abi6.patch
|
||||
./2.7.3-dbm.patch
|
||||
./2.7.3-dylib.patch
|
||||
./2.7.3-getpath-exe-extension.patch
|
||||
./2.7.3-no-libm.patch
|
||||
]
|
||||
++ lib.optionals hasDistutilsCxxPatch [
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isCygwin [
|
||||
./2.5.2-ctypes-util-find_library.patch
|
||||
./2.5.2-tkinter-x11.patch
|
||||
./2.6.2-ssl-threads.patch
|
||||
./2.6.5-export-PySignal_SetWakeupFd.patch
|
||||
./2.6.5-FD_SETSIZE.patch
|
||||
./2.6.5-ncurses-abi6.patch
|
||||
./2.7.3-dbm.patch
|
||||
./2.7.3-dylib.patch
|
||||
./2.7.3-getpath-exe-extension.patch
|
||||
./2.7.3-no-libm.patch
|
||||
]
|
||||
++ lib.optionals hasDistutilsCxxPatch [
|
||||
|
||||
# Patch from http://bugs.python.org/issue1222585 adapted to work with
|
||||
# `patch -p1' and with a last hunk removed
|
||||
# Upstream distutils is calling C compiler to compile C++ code, which
|
||||
# only works for GCC and Apple Clang. This makes distutils to call C++
|
||||
# compiler when needed.
|
||||
./python-2.7-distutils-C++.patch
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
./cross-compile.patch
|
||||
];
|
||||
# Patch from http://bugs.python.org/issue1222585 adapted to work with
|
||||
# `patch -p1' and with a last hunk removed
|
||||
# Upstream distutils is calling C compiler to compile C++ code, which
|
||||
# only works for GCC and Apple Clang. This makes distutils to call C++
|
||||
# compiler when needed.
|
||||
./python-2.7-distutils-C++.patch
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
./cross-compile.patch
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
# Purity.
|
||||
for i in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
done
|
||||
''
|
||||
+ lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
|
||||
for i in Lib/plat-*/regen; do
|
||||
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
|
||||
done
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
||||
substituteInPlace Lib/multiprocessing/__init__.py \
|
||||
--replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
|
||||
'';
|
||||
preConfigure = ''
|
||||
# Purity.
|
||||
for i in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
done
|
||||
''
|
||||
+ lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
|
||||
for i in Lib/plat-*/regen; do
|
||||
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
|
||||
done
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
||||
substituteInPlace Lib/multiprocessing/__init__.py \
|
||||
--replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
lib.optionals enableOptimizations [
|
||||
@@ -279,12 +277,13 @@ let
|
||||
tk
|
||||
libX11
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook ]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
buildPackages.stdenv.cc
|
||||
buildPackages.python27
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
buildPackages.stdenv.cc
|
||||
buildPackages.python27
|
||||
];
|
||||
|
||||
mkPaths = paths: {
|
||||
C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths;
|
||||
@@ -329,68 +328,66 @@ stdenv.mkDerivation (
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
# needed for some packages, especially packages that backport
|
||||
# functionality to 2.x from 3.x
|
||||
for item in $out/lib/${libPrefix}/test/*; do
|
||||
if [[ "$item" != */test_support.py*
|
||||
&& "$item" != */test/support
|
||||
&& "$item" != */test/regrtest.py* ]]; then
|
||||
rm -rf "$item"
|
||||
else
|
||||
echo $item
|
||||
fi
|
||||
done
|
||||
touch $out/lib/${libPrefix}/test/__init__.py
|
||||
ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb
|
||||
ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor}
|
||||
ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
|
||||
postInstall = ''
|
||||
# needed for some packages, especially packages that backport
|
||||
# functionality to 2.x from 3.x
|
||||
for item in $out/lib/${libPrefix}/test/*; do
|
||||
if [[ "$item" != */test_support.py*
|
||||
&& "$item" != */test/support
|
||||
&& "$item" != */test/regrtest.py* ]]; then
|
||||
rm -rf "$item"
|
||||
else
|
||||
echo $item
|
||||
fi
|
||||
done
|
||||
touch $out/lib/${libPrefix}/test/__init__.py
|
||||
ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb
|
||||
ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor}
|
||||
ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
|
||||
|
||||
rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
|
||||
rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
|
||||
|
||||
# Determinism: Windows installers were not deterministic.
|
||||
# We're also not interested in building Windows installers.
|
||||
find "$out" -name 'wininst*.exe' | xargs -r rm -f
|
||||
''
|
||||
+ lib.optionalString stripBytecode ''
|
||||
# Determinism: deterministic bytecode
|
||||
# First we delete all old bytecode.
|
||||
find $out -name "*.pyc" -delete
|
||||
''
|
||||
+ lib.optionalString rebuildBytecode ''
|
||||
# We build 3 levels of optimized bytecode. Note the default level, without optimizations,
|
||||
# is not reproducible yet. https://bugs.python.org/issue29708
|
||||
# Not creating bytecode will result in a large performance loss however, so we do build it.
|
||||
find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isCygwin ''
|
||||
cp libpython2.7.dll.a $out/lib
|
||||
'';
|
||||
# Determinism: Windows installers were not deterministic.
|
||||
# We're also not interested in building Windows installers.
|
||||
find "$out" -name 'wininst*.exe' | xargs -r rm -f
|
||||
''
|
||||
+ lib.optionalString stripBytecode ''
|
||||
# Determinism: deterministic bytecode
|
||||
# First we delete all old bytecode.
|
||||
find $out -name "*.pyc" -delete
|
||||
''
|
||||
+ lib.optionalString rebuildBytecode ''
|
||||
# We build 3 levels of optimized bytecode. Note the default level, without optimizations,
|
||||
# is not reproducible yet. https://bugs.python.org/issue29708
|
||||
# Not creating bytecode will result in a large performance loss however, so we do build it.
|
||||
find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O -m compileall -q -f -x "lib2to3" -i -
|
||||
find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isCygwin ''
|
||||
cp libpython2.7.dll.a $out/lib
|
||||
'';
|
||||
|
||||
inherit passthru;
|
||||
|
||||
postFixup =
|
||||
''
|
||||
# Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.
|
||||
cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
|
||||
''
|
||||
+ lib.optionalString strip2to3 ''
|
||||
rm -R $out/bin/2to3 $out/lib/python*/lib2to3
|
||||
''
|
||||
+ lib.optionalString stripConfig ''
|
||||
rm -R $out/bin/python*-config $out/lib/python*/config*
|
||||
''
|
||||
+ lib.optionalString stripIdlelib ''
|
||||
# Strip IDLE
|
||||
rm -R $out/bin/idle* $out/lib/python*/idlelib
|
||||
''
|
||||
+ lib.optionalString stripTests ''
|
||||
# Strip tests
|
||||
rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
|
||||
'';
|
||||
postFixup = ''
|
||||
# Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.
|
||||
cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
|
||||
''
|
||||
+ lib.optionalString strip2to3 ''
|
||||
rm -R $out/bin/2to3 $out/lib/python*/lib2to3
|
||||
''
|
||||
+ lib.optionalString stripConfig ''
|
||||
rm -R $out/bin/python*-config $out/lib/python*/config*
|
||||
''
|
||||
+ lib.optionalString stripIdlelib ''
|
||||
# Strip IDLE
|
||||
rm -R $out/bin/idle* $out/lib/python*/idlelib
|
||||
''
|
||||
+ lib.optionalString stripTests ''
|
||||
# Strip tests
|
||||
rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -163,7 +163,8 @@ let
|
||||
pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
|
||||
override pkgsTargetTarget.${pythonAttr}
|
||||
);
|
||||
} // __splices;
|
||||
}
|
||||
// __splices;
|
||||
override =
|
||||
attr:
|
||||
let
|
||||
@@ -196,31 +197,30 @@ let
|
||||
|
||||
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
nukeReferences
|
||||
]
|
||||
++ optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
|
||||
autoreconfHook
|
||||
]
|
||||
++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
|
||||
pkg-config
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
buildPackages.stdenv.cc
|
||||
pythonOnBuildForHost
|
||||
]
|
||||
++
|
||||
optionals
|
||||
(
|
||||
stdenv.cc.isClang
|
||||
&& (!stdenv.hostPlatform.useAndroidPrebuilt or false)
|
||||
&& (enableLTO || enableOptimizations)
|
||||
)
|
||||
[
|
||||
stdenv.cc.cc.libllvm.out
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
nukeReferences
|
||||
]
|
||||
++ optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
|
||||
autoreconfHook
|
||||
]
|
||||
++ optionals (!stdenv.hostPlatform.isDarwin || passthru.pythonAtLeast "3.14") [
|
||||
pkg-config
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
buildPackages.stdenv.cc
|
||||
pythonOnBuildForHost
|
||||
]
|
||||
++
|
||||
optionals
|
||||
(
|
||||
stdenv.cc.isClang
|
||||
&& (!stdenv.hostPlatform.useAndroidPrebuilt or false)
|
||||
&& (enableLTO || enableOptimizations)
|
||||
)
|
||||
[
|
||||
stdenv.cc.cc.libllvm.out
|
||||
];
|
||||
|
||||
buildInputs = lib.filter (p: p != null) (
|
||||
[
|
||||
@@ -325,98 +325,97 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"'
|
||||
'';
|
||||
|
||||
patches =
|
||||
[
|
||||
# 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
|
||||
# (since it will do a futile invocation of gcc (!) to find
|
||||
# libuuid, slowing down program startup a lot).
|
||||
noldconfigPatch
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [
|
||||
# Cross compilation only supports a limited number of "known good"
|
||||
# configurations. If you're reading this and it's been a long time
|
||||
# since this diff, consider submitting this patch upstream!
|
||||
./freebsd-cross.patch
|
||||
]
|
||||
++ optionals (pythonOlder "3.13") [
|
||||
# Make sure that the virtualenv activation scripts are
|
||||
# owner-writable, so venvs can be recreated without permission
|
||||
# errors.
|
||||
./virtualenv-permissions.patch
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.13") [
|
||||
./3.13/virtualenv-permissions.patch
|
||||
]
|
||||
++ optionals mimetypesSupport [
|
||||
# Make the mimetypes module refer to the right file
|
||||
./mimetypes.patch
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
|
||||
# Stop checking for TCL/TK in global macOS locations
|
||||
./3.9/darwin-tcl-tk.patch
|
||||
]
|
||||
++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
|
||||
# Fix for http://bugs.python.org/issue1222585
|
||||
# Upstream distutils is calling C compiler to compile C++ code, which
|
||||
# only works for GCC and Apple Clang. This makes distutils to call C++
|
||||
# compiler when needed.
|
||||
(
|
||||
if pythonAtLeast "3.7" && pythonOlder "3.11" then
|
||||
./3.7/python-3.x-distutils-C++.patch
|
||||
else if pythonAtLeast "3.11" then
|
||||
./3.11/python-3.x-distutils-C++.patch
|
||||
else
|
||||
fetchpatch {
|
||||
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
|
||||
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
|
||||
}
|
||||
)
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.7" && pythonOlder "3.12") [
|
||||
# LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
|
||||
./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 (pythonOlder "3.12") [
|
||||
# https://github.com/python/cpython/issues/90656
|
||||
./loongarch-support.patch
|
||||
# fix failing tests with openssl >= 3.4
|
||||
# https://github.com/python/cpython/pull/127361
|
||||
]
|
||||
++ 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 {
|
||||
name = "mingw-python-patches";
|
||||
url = "https://src.fedoraproject.org/rpms/mingw-python3.git";
|
||||
rev = "3edecdbfb4bbf1276d09cd5e80e9fb3dd88c9511"; # for python 3.11.9 at the time of writing.
|
||||
hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY=";
|
||||
};
|
||||
in
|
||||
(builtins.map (f: "${mingw-patch}/${f}") [
|
||||
# The other patches in that repo are already applied to 3.11.10
|
||||
"mingw-python3_distutils.patch"
|
||||
"mingw-python3_frozenmain.patch"
|
||||
"mingw-python3_make-sysconfigdata.py-relocatable.patch"
|
||||
"mingw-python3_mods-failed.patch"
|
||||
"mingw-python3_module-select.patch"
|
||||
"mingw-python3_module-socket.patch"
|
||||
"mingw-python3_modules.patch"
|
||||
"mingw-python3_platform-mingw.patch"
|
||||
"mingw-python3_posix-layout.patch"
|
||||
"mingw-python3_pthread_threadid.patch"
|
||||
"mingw-python3_pythonw.patch"
|
||||
"mingw-python3_setenv.patch"
|
||||
"mingw-python3_win-modules.patch"
|
||||
])
|
||||
);
|
||||
patches = [
|
||||
# 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
|
||||
# (since it will do a futile invocation of gcc (!) to find
|
||||
# libuuid, slowing down program startup a lot).
|
||||
noldconfigPatch
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [
|
||||
# Cross compilation only supports a limited number of "known good"
|
||||
# configurations. If you're reading this and it's been a long time
|
||||
# since this diff, consider submitting this patch upstream!
|
||||
./freebsd-cross.patch
|
||||
]
|
||||
++ optionals (pythonOlder "3.13") [
|
||||
# Make sure that the virtualenv activation scripts are
|
||||
# owner-writable, so venvs can be recreated without permission
|
||||
# errors.
|
||||
./virtualenv-permissions.patch
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.13") [
|
||||
./3.13/virtualenv-permissions.patch
|
||||
]
|
||||
++ optionals mimetypesSupport [
|
||||
# Make the mimetypes module refer to the right file
|
||||
./mimetypes.patch
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
|
||||
# Stop checking for TCL/TK in global macOS locations
|
||||
./3.9/darwin-tcl-tk.patch
|
||||
]
|
||||
++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
|
||||
# Fix for http://bugs.python.org/issue1222585
|
||||
# Upstream distutils is calling C compiler to compile C++ code, which
|
||||
# only works for GCC and Apple Clang. This makes distutils to call C++
|
||||
# compiler when needed.
|
||||
(
|
||||
if pythonAtLeast "3.7" && pythonOlder "3.11" then
|
||||
./3.7/python-3.x-distutils-C++.patch
|
||||
else if pythonAtLeast "3.11" then
|
||||
./3.11/python-3.x-distutils-C++.patch
|
||||
else
|
||||
fetchpatch {
|
||||
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
|
||||
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
|
||||
}
|
||||
)
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.7" && pythonOlder "3.12") [
|
||||
# LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
|
||||
./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 (pythonOlder "3.12") [
|
||||
# https://github.com/python/cpython/issues/90656
|
||||
./loongarch-support.patch
|
||||
# fix failing tests with openssl >= 3.4
|
||||
# https://github.com/python/cpython/pull/127361
|
||||
]
|
||||
++ 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 {
|
||||
name = "mingw-python-patches";
|
||||
url = "https://src.fedoraproject.org/rpms/mingw-python3.git";
|
||||
rev = "3edecdbfb4bbf1276d09cd5e80e9fb3dd88c9511"; # for python 3.11.9 at the time of writing.
|
||||
hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY=";
|
||||
};
|
||||
in
|
||||
(builtins.map (f: "${mingw-patch}/${f}") [
|
||||
# The other patches in that repo are already applied to 3.11.10
|
||||
"mingw-python3_distutils.patch"
|
||||
"mingw-python3_frozenmain.patch"
|
||||
"mingw-python3_make-sysconfigdata.py-relocatable.patch"
|
||||
"mingw-python3_mods-failed.patch"
|
||||
"mingw-python3_module-select.patch"
|
||||
"mingw-python3_module-socket.patch"
|
||||
"mingw-python3_modules.patch"
|
||||
"mingw-python3_platform-mingw.patch"
|
||||
"mingw-python3_posix-layout.patch"
|
||||
"mingw-python3_pthread_threadid.patch"
|
||||
"mingw-python3_pythonw.patch"
|
||||
"mingw-python3_setenv.patch"
|
||||
"mingw-python3_win-modules.patch"
|
||||
])
|
||||
);
|
||||
|
||||
postPatch =
|
||||
optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
@@ -449,142 +448,140 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
# https://docs.python.org/3/using/configure.html
|
||||
configureFlags =
|
||||
[
|
||||
"--without-ensurepip"
|
||||
]
|
||||
++ optionals withExpat [
|
||||
"--with-system-expat"
|
||||
]
|
||||
++ optionals withMpdecimal [
|
||||
"--with-system-libmpdec"
|
||||
]
|
||||
++ optionals (openssl != null) [
|
||||
"--with-openssl=${openssl.dev}"
|
||||
]
|
||||
++ optionals tzdataSupport [
|
||||
"--with-tzpath=${tzdata}/share/zoneinfo"
|
||||
]
|
||||
++ optionals (execSuffix != "") [
|
||||
"--with-suffix=${execSuffix}"
|
||||
]
|
||||
++ optionals enableLTO [
|
||||
"--with-lto"
|
||||
]
|
||||
++ optionals (!static && !enableFramework) [
|
||||
"--enable-shared"
|
||||
]
|
||||
++ optionals enableFramework [
|
||||
"--enable-framework=${placeholder "out"}/Library/Frameworks"
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.13") [
|
||||
(enableFeature enableGIL "gil")
|
||||
]
|
||||
++ optionals enableOptimizations [
|
||||
"--enable-optimizations"
|
||||
]
|
||||
++ optionals enableDebug [
|
||||
"--with-pydebug"
|
||||
]
|
||||
++ optionals (sqlite != null) [
|
||||
"--enable-loadable-sqlite-extensions"
|
||||
]
|
||||
++ optionals (libxcrypt != null) [
|
||||
"CFLAGS=-I${libxcrypt}/include"
|
||||
"LIBS=-L${libxcrypt}/lib"
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"ac_cv_buggy_getaddrinfo=no"
|
||||
# Assume little-endian IEEE 754 floating point when cross compiling
|
||||
"ac_cv_little_endian_double=yes"
|
||||
"ac_cv_big_endian_double=no"
|
||||
"ac_cv_mixed_endian_double=no"
|
||||
"ac_cv_x87_double_rounding=yes"
|
||||
"ac_cv_tanh_preserves_zero_sign=yes"
|
||||
# Generally assume that things are present and work
|
||||
"ac_cv_posix_semaphores_enabled=yes"
|
||||
"ac_cv_broken_sem_getvalue=no"
|
||||
"ac_cv_wchar_t_signed=yes"
|
||||
"ac_cv_rshift_extends_sign=yes"
|
||||
"ac_cv_broken_nice=no"
|
||||
"ac_cv_broken_poll=no"
|
||||
"ac_cv_working_tzset=yes"
|
||||
"ac_cv_have_long_long_format=yes"
|
||||
"ac_cv_have_size_t_format=yes"
|
||||
"ac_cv_computed_gotos=yes"
|
||||
# Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
|
||||
"ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
|
||||
"ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
|
||||
"--with-build-python=${pythonOnBuildForHostInterpreter}"
|
||||
]
|
||||
++ optionals stdenv.hostPlatform.isLinux [
|
||||
# Never even try to use lchmod on linux,
|
||||
# don't rely on detecting glibc-isms.
|
||||
"ac_cv_func_lchmod=no"
|
||||
]
|
||||
++ optionals static [
|
||||
"--disable-test-modules"
|
||||
"LDFLAGS=-static"
|
||||
"MODULE_BUILDTYPE=static"
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isMusl) [
|
||||
# dlopen is a no-op in static musl builds, and since we build everything without -fPIC it's better not to pretend.
|
||||
"ac_cv_func_dlopen=no"
|
||||
];
|
||||
configureFlags = [
|
||||
"--without-ensurepip"
|
||||
]
|
||||
++ optionals withExpat [
|
||||
"--with-system-expat"
|
||||
]
|
||||
++ optionals withMpdecimal [
|
||||
"--with-system-libmpdec"
|
||||
]
|
||||
++ optionals (openssl != null) [
|
||||
"--with-openssl=${openssl.dev}"
|
||||
]
|
||||
++ optionals tzdataSupport [
|
||||
"--with-tzpath=${tzdata}/share/zoneinfo"
|
||||
]
|
||||
++ optionals (execSuffix != "") [
|
||||
"--with-suffix=${execSuffix}"
|
||||
]
|
||||
++ optionals enableLTO [
|
||||
"--with-lto"
|
||||
]
|
||||
++ optionals (!static && !enableFramework) [
|
||||
"--enable-shared"
|
||||
]
|
||||
++ optionals enableFramework [
|
||||
"--enable-framework=${placeholder "out"}/Library/Frameworks"
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.13") [
|
||||
(enableFeature enableGIL "gil")
|
||||
]
|
||||
++ optionals enableOptimizations [
|
||||
"--enable-optimizations"
|
||||
]
|
||||
++ optionals enableDebug [
|
||||
"--with-pydebug"
|
||||
]
|
||||
++ optionals (sqlite != null) [
|
||||
"--enable-loadable-sqlite-extensions"
|
||||
]
|
||||
++ optionals (libxcrypt != null) [
|
||||
"CFLAGS=-I${libxcrypt}/include"
|
||||
"LIBS=-L${libxcrypt}/lib"
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"ac_cv_buggy_getaddrinfo=no"
|
||||
# Assume little-endian IEEE 754 floating point when cross compiling
|
||||
"ac_cv_little_endian_double=yes"
|
||||
"ac_cv_big_endian_double=no"
|
||||
"ac_cv_mixed_endian_double=no"
|
||||
"ac_cv_x87_double_rounding=yes"
|
||||
"ac_cv_tanh_preserves_zero_sign=yes"
|
||||
# Generally assume that things are present and work
|
||||
"ac_cv_posix_semaphores_enabled=yes"
|
||||
"ac_cv_broken_sem_getvalue=no"
|
||||
"ac_cv_wchar_t_signed=yes"
|
||||
"ac_cv_rshift_extends_sign=yes"
|
||||
"ac_cv_broken_nice=no"
|
||||
"ac_cv_broken_poll=no"
|
||||
"ac_cv_working_tzset=yes"
|
||||
"ac_cv_have_long_long_format=yes"
|
||||
"ac_cv_have_size_t_format=yes"
|
||||
"ac_cv_computed_gotos=yes"
|
||||
# Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
|
||||
"ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
|
||||
"ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
|
||||
"--with-build-python=${pythonOnBuildForHostInterpreter}"
|
||||
]
|
||||
++ optionals stdenv.hostPlatform.isLinux [
|
||||
# Never even try to use lchmod on linux,
|
||||
# don't rely on detecting glibc-isms.
|
||||
"ac_cv_func_lchmod=no"
|
||||
]
|
||||
++ optionals static [
|
||||
"--disable-test-modules"
|
||||
"LDFLAGS=-static"
|
||||
"MODULE_BUILDTYPE=static"
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isMusl) [
|
||||
# dlopen is a no-op in static musl builds, and since we build everything without -fPIC it's better not to pretend.
|
||||
"ac_cv_func_dlopen=no"
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
# Attempt to purify some of the host info collection
|
||||
sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess
|
||||
sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure
|
||||
''
|
||||
+ optionalString (pythonOlder "3.12") ''
|
||||
# Improve purity
|
||||
for path in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace-warn $path /no-such-path
|
||||
done
|
||||
''
|
||||
+ optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") ''
|
||||
# Fix _ctypes module compilation
|
||||
export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1"
|
||||
''
|
||||
+ optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Override the auto-detection in setup.py, which assumes a universal build
|
||||
export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}
|
||||
# Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
|
||||
sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
|
||||
''
|
||||
+ optionalString (pythonAtLeast "3.11") ''
|
||||
# Also override the auto-detection in `configure`.
|
||||
substituteInPlace configure \
|
||||
--replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${
|
||||
if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"
|
||||
}'
|
||||
''
|
||||
+ optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
|
||||
export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
|
||||
export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
|
||||
''
|
||||
+ optionalString stdenv.hostPlatform.isWindows ''
|
||||
export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
|
||||
''
|
||||
+ optionalString stdenv.hostPlatform.isMusl ''
|
||||
export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
|
||||
''
|
||||
+
|
||||
preConfigure = ''
|
||||
# Attempt to purify some of the host info collection
|
||||
sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess
|
||||
sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure
|
||||
''
|
||||
+ optionalString (pythonOlder "3.12") ''
|
||||
# Improve purity
|
||||
for path in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace-warn $path /no-such-path
|
||||
done
|
||||
''
|
||||
+ optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") ''
|
||||
# Fix _ctypes module compilation
|
||||
export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1"
|
||||
''
|
||||
+ optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Override the auto-detection in setup.py, which assumes a universal build
|
||||
export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}
|
||||
# Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
|
||||
sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
|
||||
''
|
||||
+ optionalString (pythonAtLeast "3.11") ''
|
||||
# Also override the auto-detection in `configure`.
|
||||
substituteInPlace configure \
|
||||
--replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${
|
||||
if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"
|
||||
}'
|
||||
''
|
||||
+ optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
|
||||
export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
|
||||
export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
|
||||
''
|
||||
+ optionalString stdenv.hostPlatform.isWindows ''
|
||||
export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
|
||||
''
|
||||
+ optionalString stdenv.hostPlatform.isMusl ''
|
||||
export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
|
||||
''
|
||||
+
|
||||
|
||||
# enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition
|
||||
# which changes how symbols are looked up. This essentially means we can't override
|
||||
# libpython symbols via LD_PRELOAD anymore. This is common enough as every build
|
||||
# that uses --enable-optimizations has the same "issue".
|
||||
#
|
||||
# The Fedora wiki has a good article about their journey towards enabling this flag:
|
||||
# https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
|
||||
optionalString enableNoSemanticInterposition ''
|
||||
export CFLAGS_NODIST="-fno-semantic-interposition"
|
||||
'';
|
||||
# enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition
|
||||
# which changes how symbols are looked up. This essentially means we can't override
|
||||
# libpython symbols via LD_PRELOAD anymore. This is common enough as every build
|
||||
# that uses --enable-optimizations has the same "issue".
|
||||
#
|
||||
# The Fedora wiki has a good article about their journey towards enabling this flag:
|
||||
# https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
|
||||
optionalString enableNoSemanticInterposition ''
|
||||
export CFLAGS_NODIST="-fno-semantic-interposition"
|
||||
'';
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user