git.iko.soy/typeable/nixpkgs
on master help sign in
pythonInterpreters.pypy{27,36}_prebuilt: 7.1.1 -> 7.3.1

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

commit6f2ec6d9679353f358fc49283faa8fdd2be32555 authorAnders Kaseorg <andersk@mit.edu> dateMon 10 Aug 2020, 01:23 (6 years ago) parent96069f7
2 files changed+13−16
pkgs/development/interpreters/python/default.nix+4−6 pkgs/development/interpreters/python/pypy/prebuilt.nix+9−10
pkgs/development/interpreters/python/default.nix+4−6
@@ -191,13 +191,12 @@ in {
191191 self = pythonInterpreters.pypy27_prebuilt;
192192 sourceVersion = {
193193 major = "7";
194− minor = "1";
194+ minor = "3";
195195 patch = "1";
196196 };
197− sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64
197+ sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64
198198 pythonVersion = "2.7";
199199 inherit passthruFun;
200− ncurses = ncurses5;
201200 };
202201
203202 pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
@@ -205,13 +204,12 @@ in {
205204 self = pythonInterpreters.pypy36_prebuilt;
206205 sourceVersion = {
207206 major = "7";
208− minor = "1";
207+ minor = "3";
209208 patch = "1";
210209 };
211− sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64
210+ sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64
212211 pythonVersion = "3.6";
213212 inherit passthruFun;
214− ncurses = ncurses5;
215213 };
216214
217215 graalpython37 = callPackage ./graalpython/default.nix {
pkgs/development/interpreters/python/pypy/prebuilt.nix+9−10
@@ -8,10 +8,9 @@
88, zlib
99, openssl_1_0_2
1010, expat
11−, libffi
12−, ncurses
13−, tcl
14−, tk
11+, ncurses6
12+, tcl-8_5
13+, tk-8_5
1514# For the Python package set
1615, packageOverrides ? (self: super: {})
1716, sourceVersion
@@ -46,10 +45,9 @@ let
4645 zlib
4746 openssl_1_0_2
4847 expat
49− libffi
50− ncurses
51− tcl
52− tk
48+ ncurses6
49+ tcl-8_5
50+ tk-8_5
5351 ];
5452
5553in with passthru; stdenv.mkDerivation {
@@ -66,6 +64,7 @@ in with passthru; stdenv.mkDerivation {
6664 mkdir -p $out/lib
6765 echo "Moving files to $out"
6866 mv -t $out bin include lib-python lib_pypy site-packages
67+ mv lib/libffi.so.6* $out/lib/
6968
7069 mv $out/bin/libpypy*-c.so $out/lib/
7170
@@ -78,8 +77,8 @@ in with passthru; stdenv.mkDerivation {
7877 $out/bin/pypy*
7978
8079 pushd $out
81− find {lib,lib_pypy*} -name "*.so" -exec patchelf --replace-needed "libbz2.so.1.0" "libbz2.so.1" {} \;
82− find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps} {} \;
80+ find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
81+ find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \;
8382
8483 echo "Removing bytecode"
8584 find . -name "__pycache__" -type d -depth -exec rm -rf {} \;