pythonInterpreters.pypy{27,36}_prebuilt: 7.1.1 -> 7.3.1
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
parent
96069f7d89
commit
6f2ec6d967
|
@ -191,13 +191,12 @@ in {
|
||||||
self = pythonInterpreters.pypy27_prebuilt;
|
self = pythonInterpreters.pypy27_prebuilt;
|
||||||
sourceVersion = {
|
sourceVersion = {
|
||||||
major = "7";
|
major = "7";
|
||||||
minor = "1";
|
minor = "3";
|
||||||
patch = "1";
|
patch = "1";
|
||||||
};
|
};
|
||||||
sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64
|
sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64
|
||||||
pythonVersion = "2.7";
|
pythonVersion = "2.7";
|
||||||
inherit passthruFun;
|
inherit passthruFun;
|
||||||
ncurses = ncurses5;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
|
pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
|
||||||
|
@ -205,13 +204,12 @@ in {
|
||||||
self = pythonInterpreters.pypy36_prebuilt;
|
self = pythonInterpreters.pypy36_prebuilt;
|
||||||
sourceVersion = {
|
sourceVersion = {
|
||||||
major = "7";
|
major = "7";
|
||||||
minor = "1";
|
minor = "3";
|
||||||
patch = "1";
|
patch = "1";
|
||||||
};
|
};
|
||||||
sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64
|
sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64
|
||||||
pythonVersion = "3.6";
|
pythonVersion = "3.6";
|
||||||
inherit passthruFun;
|
inherit passthruFun;
|
||||||
ncurses = ncurses5;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
graalpython37 = callPackage ./graalpython/default.nix {
|
graalpython37 = callPackage ./graalpython/default.nix {
|
||||||
|
|
|
@ -8,10 +8,9 @@
|
||||||
, zlib
|
, zlib
|
||||||
, openssl_1_0_2
|
, openssl_1_0_2
|
||||||
, expat
|
, expat
|
||||||
, libffi
|
, ncurses6
|
||||||
, ncurses
|
, tcl-8_5
|
||||||
, tcl
|
, tk-8_5
|
||||||
, tk
|
|
||||||
# For the Python package set
|
# For the Python package set
|
||||||
, packageOverrides ? (self: super: {})
|
, packageOverrides ? (self: super: {})
|
||||||
, sourceVersion
|
, sourceVersion
|
||||||
|
@ -46,10 +45,9 @@ let
|
||||||
zlib
|
zlib
|
||||||
openssl_1_0_2
|
openssl_1_0_2
|
||||||
expat
|
expat
|
||||||
libffi
|
ncurses6
|
||||||
ncurses
|
tcl-8_5
|
||||||
tcl
|
tk-8_5
|
||||||
tk
|
|
||||||
];
|
];
|
||||||
|
|
||||||
in with passthru; stdenv.mkDerivation {
|
in with passthru; stdenv.mkDerivation {
|
||||||
|
@ -66,6 +64,7 @@ in with passthru; stdenv.mkDerivation {
|
||||||
mkdir -p $out/lib
|
mkdir -p $out/lib
|
||||||
echo "Moving files to $out"
|
echo "Moving files to $out"
|
||||||
mv -t $out bin include lib-python lib_pypy site-packages
|
mv -t $out bin include lib-python lib_pypy site-packages
|
||||||
|
mv lib/libffi.so.6* $out/lib/
|
||||||
|
|
||||||
mv $out/bin/libpypy*-c.so $out/lib/
|
mv $out/bin/libpypy*-c.so $out/lib/
|
||||||
|
|
||||||
|
@ -78,8 +77,8 @@ in with passthru; stdenv.mkDerivation {
|
||||||
$out/bin/pypy*
|
$out/bin/pypy*
|
||||||
|
|
||||||
pushd $out
|
pushd $out
|
||||||
find {lib,lib_pypy*} -name "*.so" -exec patchelf --replace-needed "libbz2.so.1.0" "libbz2.so.1" {} \;
|
find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
|
||||||
find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps} {} \;
|
find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \;
|
||||||
|
|
||||||
echo "Removing bytecode"
|
echo "Removing bytecode"
|
||||||
find . -name "__pycache__" -type d -depth -exec rm -rf {} \;
|
find . -name "__pycache__" -type d -depth -exec rm -rf {} \;
|
||||||
|
|
Loading…
Reference in a new issue