nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40459 from andersk/pypy

Browse Source 
pypy: 5.10.0 -> 6.0.0
This commit is contained in:
Jörg Thalheim 2018-12-18 20:35:38 +00:00 committed by GitHub
commit ab9c602fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,19 +10,16 @@
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
let let
majorVersion = "6.0"; version = "6.0.0";
minorVersion = "0";
minorVersionSuffix = "";
pythonVersion = "2.7"; pythonVersion = "2.7";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "pypy${pythonVersion}";
libPrefix = "pypy${majorVersion}";
sitePackages = "site-packages"; sitePackages = "site-packages";
pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "pypy-${version}"; name = "pypy-${version}";
inherit majorVersion version pythonVersion; inherit version pythonVersion;
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
@ -69,12 +66,7 @@ in stdenv.mkDerivation rec {
${pythonForPypy.interpreter} rpython/bin/rpython \ ${pythonForPypy.interpreter} rpython/bin/rpython \
--make-jobs="$NIX_BUILD_CORES" \ --make-jobs="$NIX_BUILD_CORES" \
-Ojit \ -Ojit \
--batch pypy/goal/targetpypystandalone.py \ --batch pypy/goal/targetpypystandalone.py
--withmod-_minimal_curses \
--withmod-unicodedata \
--withmod-thread \
--withmod-bz2 \
--withmod-_multiprocessing
''; '';
setupHook = python-setup-hook sitePackages; setupHook = python-setup-hook sitePackages;
@ -87,9 +79,7 @@ in stdenv.mkDerivation rec {
# disable shutils because it assumes gid 0 exists # disable shutils because it assumes gid 0 exists
# disable socket because it has two actual network tests that fail # 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_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 ./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
# 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
''; '';
installPhase = '' installPhase = ''
@ -126,6 +116,8 @@ in stdenv.mkDerivation rec {
inherit zlibSupport libPrefix sitePackages; inherit zlibSupport libPrefix sitePackages;
executable = "pypy"; executable = "pypy";
isPypy = true; isPypy = true;
isPy2 = true;
isPy27 = true;
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
interpreter = "${self}/bin/${executable}"; interpreter = "${self}/bin/${executable}";
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};