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

Merge master into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát
2013-12-21 10:20:55 +01:00
parent f6b3e2ca54 d6a95753d5
commit 2b24f1349a
79 changed files with 538 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/pypy/2.2/default.nix
View File

@@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
let
majorVersion = "2.2";
majorVersion = "2.2.1";
version = "${majorVersion}";
pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}";
@@ -17,7 +17,7 @@ let
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh";
sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815";
};
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
@@ -56,7 +56,8 @@ let
export HOME="$TMPDIR";
# disable shutils because it assumes gid 0 exists
# disable socket because it has two actual network tests that fail
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python
# disable test_mhlib because it fails for unknown reason
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil -test_mhlib' lib-python
'';
installPhase = ''