From f96349c45658174d33836ea6c2b5528473977284 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 03:58:35 -0500 Subject: [PATCH 1/4] pypy: Change libPrefix from pypy5.10 to pypy2.7 To avoid conflicting with pypy3, as per https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484. Signed-off-by: Anders Kaseorg --- .../development/interpreters/python/pypy/2.7/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d95707ecb22d..3e2aa9d8d83c 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -10,19 +10,16 @@ assert zlibSupport -> zlib != null; let - majorVersion = "6.0"; - minorVersion = "0"; - minorVersionSuffix = ""; + version = "6.0.0"; pythonVersion = "2.7"; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "pypy${majorVersion}"; + libPrefix = "pypy${pythonVersion}"; sitePackages = "site-packages"; pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); in stdenv.mkDerivation rec { name = "pypy-${version}"; - inherit majorVersion version pythonVersion; + inherit version pythonVersion; src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; From 91333c1740f45fe55ae248dddc9c86f057f02310 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:00:41 -0500 Subject: [PATCH 2/4] pypy: Remove redundant --withmod-* flags --allworkingmodules is already the default. Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 3e2aa9d8d83c..854467e65a88 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -66,12 +66,7 @@ in stdenv.mkDerivation rec { ${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 + --batch pypy/goal/targetpypystandalone.py ''; setupHook = python-setup-hook sitePackages; From 8b80dec522bd5e0e628e8ac018ed7b58f397a57f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:01:25 -0500 Subject: [PATCH 3/4] pypy: Reenable tests fixed upstream Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 854467e65a88..d8fb633958ee 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -79,9 +79,7 @@ in stdenv.mkDerivation rec { # disable shutils because it assumes gid 0 exists # 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 - ./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 )' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil )' lib-python ''; installPhase = '' From 6d80927a43baee1b006fd54944084001dc04b5a5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:06:08 -0500 Subject: [PATCH 4/4] pypy: Set isPy2, isPy27 Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d8fb633958ee..6f7fa9622960 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -116,6 +116,8 @@ in stdenv.mkDerivation rec { inherit zlibSupport libPrefix sitePackages; executable = "pypy"; isPypy = true; + isPy2 = true; + isPy27 = true; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; interpreter = "${self}/bin/${executable}"; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};