git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95127 from andersk/pypy-7.3.1

pypy: 7.1.1 -> 7.3.1

commit52419cc32e5480c3de812de2018d3e69268080b6 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateTue 11 Aug 2020, 16:04 (6 years ago) parent5c68e31b31e4a2
3 files changed+19−29
pkgs/development/interpreters/python/default.nix+8−10 pkgs/development/interpreters/python/pypy/default.nix+2−9 pkgs/development/interpreters/python/pypy/prebuilt.nix+9−10
pkgs/development/interpreters/python/default.nix+8−10
@@ -158,10 +158,10 @@ in {
158158 self = pypy27;
159159 sourceVersion = {
160160 major = "7";
161− minor = "1";
161+ minor = "3";
162162 patch = "1";
163163 };
164− sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg";
164+ sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs";
165165 pythonVersion = "2.7";
166166 db = db.override { dbmSupport = !stdenv.isDarwin; };
167167 python = python27;
@@ -174,10 +174,10 @@ in {
174174 self = pypy36;
175175 sourceVersion = {
176176 major = "7";
177− minor = "1";
177+ minor = "3";
178178 patch = "1";
179179 };
180− sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1";
180+ sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c";
181181 pythonVersion = "3.6";
182182 db = db.override { dbmSupport = !stdenv.isDarwin; };
183183 python = python27;
@@ -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/default.nix+2−9
@@ -34,7 +34,7 @@ in with passthru; stdenv.mkDerivation rec {
3434 inherit pname version;
3535
3636 src = fetchurl {
37− url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
37+ url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2";
3838 inherit sha256;
3939 };
4040
@@ -75,13 +75,6 @@ in with passthru; stdenv.mkDerivation rec {
7575 postPatch = ''
7676 substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
7777
78− # hint pypy to find nix ncurses
79− substituteInPlace pypy/module/_minimal_curses/fficurses.py \
80− --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
81− --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
82− --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
83− --replace "libraries=['curses']" "libraries=['ncurses']"
84−
8578 sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
8679 '';
8780
@@ -137,7 +130,7 @@ in with passthru; stdenv.mkDerivation rec {
137130 ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
138131
139132 # other packages expect to find stuff according to libPrefix
140− ln -s $out/${executable}/include $out/include/${libPrefix}
133+ ln -s $out/${executable}-c/include $out/include/${libPrefix}
141134 ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
142135
143136 ${stdenv.lib.optionalString stdenv.isDarwin ''
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 {} \;