diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-16 15:16:50 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-16 15:16:50 +0200 |
| commit | 09dc132e04c8a69581becb56a1c5e1bfee3aef7e (patch) | |
| tree | 186745725ff42ea953572f38eaca71161fee9406 /pkgs/development/interpreters/pypy | |
| parent | 3c6efec2c09e9389eb973ec5e45cb8e04b35f8aa (diff) | |
| parent | e39bf7a7043a466761754c423b3d5783a320a6ce (diff) | |
| download | nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.gz nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.bz2 nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.lz nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.xz nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.zst nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/poppler/default.nix
Diffstat (limited to 'pkgs/development/interpreters/pypy')
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.4/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 8f9647c21342..b8065ad047ef 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -71,7 +71,8 @@ let # disable test_multiprocessing due to transient errors # disable test_os because test_urandom_failure fails # disable test_urllib2net and test_urllibnet because it requires networking (example.com) - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing)' lib-python + # disable test_zipfile64 because it randomly timeouts + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python ''; installPhase = '' |