public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pypy: 5.8 -> 5.9

Browse Source
This commit is contained in:
Joerg Thalheim 2017-11-21 11:04:34 +00:00
parent 73746502d8
commit b99226706d
3 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch
View File

@ -1,21 +0,0 @@
# HG changeset patch
# User Armin Rigo <arigo@tunes.org>
# Date 1500108588 -7200
# Node ID 20f7723ff895430c2f45647e7d0c0ca56d93e40a
# Parent d135217574a6bd2e87a883e1d495f82c5e89bc8b
(ronan, arigo)
Issue #2604: skip this test (fails on some Linux because pypy uses the
new getrandom() syscall)
diff --git a/lib-python/2.7/test/test_os.py b/lib-python/2.7/test/test_os.py
--- a/lib-python/2.7/test/test_os.py
+++ b/lib-python/2.7/test/test_os.py
@@ -580,6 +580,7 @@
"getentropy() does not use a file descriptor")
class URandomFDTests(unittest.TestCase):
@unittest.skipUnless(resource, "test requires the resource module")
+ @test_support.impl_detail(pypy=False) # on Linux, may use getrandom()
def test_urandom_failure(self):
# Check urandom() failing when it is not able to open /dev/random.
# We spawn a new process to make the test more robust (if getrlimit()

58
pkgs/development/interpreters/python/pypy/2.7/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
{ stdenv, substituteAll, fetchurl
, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
, makeWrapper, callPackage, self, gdbm, db
, python-setup-hook
@ -9,7 +10,7 @@
assert zlibSupport -> zlib != null;
let
majorVersion = "5.8";
majorVersion = "5.9";
minorVersion = "0";
minorVersionSuffix = "";
pythonVersion = "2.7";
@ -25,21 +26,13 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
sha256 = "0dibf1bx4icrbi8zsqk7cfwgwsd3hfx6biz59k8j5rys3fx9z418";
sha256 = "1q3kcnniyvnca1l7x10mbhp4xwjr03ajh2h8j6cbdllci38zdjy1";
};
patches = [
# https://bitbucket.org/pypy/pypy/issues/2604/lib-python-27-test-test_ospy
./2604-skip-urandom-fd-test.patch
];
postPatch = ''
substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [
bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
++ stdenv.lib.optional zlibSupport zlib;
hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
@ -48,7 +41,20 @@ in stdenv.mkDerivation rec {
LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs;
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
preConfigure = ''
patches = [
(substituteAll {
src = ./tk_tcl_paths.patch;
inherit tk tcl;
tk_dev = tk.dev;
tcl_dev = tcl;
tk_libprefix = tk.libPrefix;
tcl_libprefix = tcl.libPrefix;
})
];
postPatch = ''
substituteInPlace "lib-python/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" \
@ -56,30 +62,32 @@ in stdenv.mkDerivation rec {
--replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
--replace "libraries=['curses']" "libraries=['ncurses']"
# tkinter hints
substituteInPlace lib_pypy/_tkinter/tklib_build.py \
--replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \
--replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \
--replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
'';
buildPhase = ''
${pythonForPypy.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
${pythonForPypy.interpreter} rpython/bin/rpython \
--make-jobs="$NIX_BUILD_CORES" \
-Ojit \
--batch pypy/goal/targetpypystandalone.py \
--withmod-_minimal_curses \
--withmod-unicodedata \
--withmod-thread \
--withmod-bz2 \
--withmod-_multiprocessing
'';
setupHook = python-setup-hook sitePackages;
postBuild = ''
cd ./lib_pypy
pushd ./lib_pypy
../pypy-c ./_audioop_build.py
../pypy-c ./_curses_build.py
../pypy-c ./_pwdgrp_build.py
../pypy-c ./_sqlite3_build.py
../pypy-c ./_syslog_build.py
../pypy-c ./_tkinter/tklib_build.py
cd ..
popd
'';
doCheck = true;

17
pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch Normal file
View File

@ -0,0 +1,17 @@
--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100
+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000
@@ -24,11 +24,11 @@
else:
# On some Linux distributions, the tcl and tk libraries are
# stored in /usr/include, so we must check this case also
- libdirs = []
+ libdirs = ["@tcl@/lib", "@tk@/lib"]
found = False
for _ver in ['', '8.6', '8.5']:
- incdirs = ['/usr/include/tcl' + _ver]
- linklibs = ['tcl' + _ver, 'tk' + _ver]
+ incdirs = ['@tcl_dev@/include', '@tk_dev@/include']
+ linklibs = ['@tcl_libprefix@', '@tk_libprefix@']
if os.path.isdir(incdirs[0]):
found = True
break