git.iko.soy/typeable/nixpkgs
on master help sign in
pypy, pypy3: 7.1.1 -> 7.3.1

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

commitb31e4a20a43ce8489255b5705bdea3355c995560 authorAnders Kaseorg <andersk@mit.edu> dateMon 10 Aug 2020, 13:34 (6 years ago) parent6f2ec6d
2 files changed+6−13
pkgs/development/interpreters/python/default.nix+4−4 pkgs/development/interpreters/python/pypy/default.nix+2−9
pkgs/development/interpreters/python/default.nix+4−4
@@ -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;
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 ''