pypy: Remove bootstrap python from closure #88454
Conversation
|
FWIW, the dependencies are from shebang lines in various stdlib files that can be executed directly (the ROT-13 module functions stand-alone, the CGI module outputs test data when ran as a script, etc.). There are a lot of these that reference diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 888c79b16dc..09a5fd60843 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -53,9 +53,6 @@ in with passthru; stdenv.mkDerivation rec {
hardeningDisable = optional stdenv.isi686 "pic";
- # Remove bootstrap python from closure
- dontPatchShebangs = true;
-
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs;
LIBRARY_PATH = makeLibraryPath buildInputs;
LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
@@ -150,6 +147,13 @@ in with passthru; stdenv.mkDerivation rec {
cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py
'';
+ preFixup = ''
+ # Fix shebangs in standard library files to avoid bringing the
+ # bootstrap Python into the package closure.
+ find $out/lib/${libPrefix} -name '*.py' \
+ -exec sed -i "1 s|^#!.*/python[23]\?$|#!$out/bin/${executable}|" {} ';'
+ '';
+
inherit passthru;
enableParallelBuilding = true; # almost no parallelization without STM
(Untested since I don't feel like staring at a Mandelbrot set for several hours right now...) |
|
I'm fine with either. Might also want to add the python3 to |
adisbladis
force-pushed
the
pypy-closure-size
branch
from
5adcd4a
to
203f382
Compare
|
I feel much better about a simple |
|
Note that all these shebangs are patched correctly using the CPython derivations, and indeed it goes out of its way to achieve this: {
# ...
preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
# Ensure patch-shebangs uses shebangs of host interpreter.
export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH
'';
# ...
}I personally think that leaving unpatched dangling shebang references in an installed package is unfortunate, but it's true that people aren't terribly likely to run these. The |
Motivation for this change
Closure size reduction by ~52M.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)cc @emilazy