pypy, pypy3: 7.1.1 -> 7.3.1
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
parent
6f2ec6d967
commit
b31e4a20a4
@ -158,10 +158,10 @@ in {
|
||||
self = pypy27;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "1";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
};
|
||||
sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg";
|
||||
sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs";
|
||||
pythonVersion = "2.7";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
@ -174,10 +174,10 @@ in {
|
||||
self = pypy36;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "1";
|
||||
minor = "3";
|
||||
patch = "1";
|
||||
};
|
||||
sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1";
|
||||
sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c";
|
||||
pythonVersion = "3.6";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
|
@ -34,7 +34,7 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
|
||||
url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
@ -75,13 +75,6 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
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'"
|
||||
|
||||
# hint pypy to find nix ncurses
|
||||
substituteInPlace pypy/module/_minimal_curses/fficurses.py \
|
||||
--replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
|
||||
--replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
|
||||
--replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
|
||||
--replace "libraries=['curses']" "libraries=['ncurses']"
|
||||
|
||||
sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
|
||||
'';
|
||||
|
||||
@ -137,7 +130,7 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
|
||||
|
||||
# other packages expect to find stuff according to libPrefix
|
||||
ln -s $out/${executable}/include $out/include/${libPrefix}
|
||||
ln -s $out/${executable}-c/include $out/include/${libPrefix}
|
||||
ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
|
||||
|
||||
${stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
Loading…
Reference in New Issue
Block a user