From 14e73a6e6f11efe3ce8bc272a67758a831062c47 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 1 Apr 2016 17:23:27 +0200 Subject: [PATCH 1/3] pypy: 4.0.1 -> 5.1.1 --- pkgs/development/interpreters/pypy/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 095e0b7db08e..cf54e02257de 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "4.0"; - version = "${majorVersion}.1"; + majorVersion = "5.1.1"; + version = "${majorVersion}"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "1g7iipllgdfjgdkypsa1g2pzxgjw9agp40rh82hk31rsbak2hfbl"; + sha256 = "1dmckvffanmh0b50pq34shnw05r55gjxn43kgvnkz5kkvvsbxdg1"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] @@ -79,7 +79,8 @@ let # disable test_zipfile64 because it randomly timeouts # disable test_cpickle because timeouts # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python + # disable test_epoll because of invalid arg, should be fixed in as of version 5.1.2 + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64 or test_epoll)' lib-python ''; installPhase = '' From e87cbf9fa3ada3ed1b5a356a26f240ec648ab875 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 7 May 2016 16:00:05 +0200 Subject: [PATCH 2/3] pypy: revise test expression --- pkgs/development/interpreters/pypy/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index cf54e02257de..927ba2683094 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -71,16 +71,10 @@ let export HOME="$TMPDIR"; # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail - # disable test_mhlib because it fails for unknown reason - # disable sqlite3 due to https://bugs.pypy.org/issue1740 - # disable test_multiprocessing due to transient errors - # disable test_os because test_urandom_failure fails # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - # disable test_zipfile64 because it randomly timeouts - # disable test_cpickle because timeouts # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure # disable test_epoll because of invalid arg, should be fixed in as of version 5.1.2 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64 or test_epoll)' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_epoll )' lib-python ''; installPhase = '' From 668f9159ab3eb6ad3cb47c01047de358263ef2b1 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 11 May 2016 18:32:30 +0200 Subject: [PATCH 3/3] pypy: deactivate test_zipfile64 again --- pkgs/development/interpreters/pypy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 927ba2683094..e4e6e51d5cfe 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -73,8 +73,9 @@ let # disable socket because it has two actual network tests that fail # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure + # disable test_zipfile64 because it causes ENOSPACE # disable test_epoll because of invalid arg, should be fixed in as of version 5.1.2 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_epoll )' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )' lib-python ''; installPhase = ''