diff options
author | Anders Kaseorg <andersk@mit.edu> | 2020-08-10 13:34:00 -0700 |
---|---|---|
committer | Anders Kaseorg <andersk@mit.edu> | 2020-08-10 15:42:42 -0700 |
commit | b31e4a20a43ce8489255b5705bdea3355c995560 (patch) | |
tree | c7ee718a6bf4bfb85db6b64ffdac87bdda2bca46 /pkgs/development/interpreters/python/pypy/default.nix | |
parent | 6f2ec6d9679353f358fc49283faa8fdd2be32555 (diff) |
pypy, pypy3: 7.1.1 -> 7.3.1
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/development/interpreters/python/pypy/default.nix')
-rw-r--r-- | pkgs/development/interpreters/python/pypy/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index e5828fdd3740..10073602071a 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -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 '' |