Commit Graph

89 Commits

Author SHA1 Message Date
Vladimír Čunát
19e80fa19d pypy: fix pyexpat tests with expat-2.2.0
/cc #16477. /cc @domenKozar (don't know who better),
as I still experience test failures of different kind:
=================================== FAILURES ===================================
_______________________________________  _______________________________________
Traceback (most recent call last):
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/pypy/tool/pytest/run-script/regrverbose.py", line 14, in <module>
    indirect_test()
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/test/test_ctypes.py", line 10, in test_main
    skipped, testcases = ctypes.test.get_tests(ctypes.test, "test_*.py", verbosity=0)
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/ctypes/test/__init__.py", line 72, in get_tests
    mod = __import__(modname, globals(), locals(), ['*'])
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/ctypes/test/test_python_api.py", line 9, in <module>
    from _ctypes import PyObj_FromPtr
ImportError: cannot import name 'PyObj_FromPtr'

=========================== short test summary info ============================
FAIL lib-python/2.7/test/test_ctypes.py::unmodified
 9 tests deselected by '-knot ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )'
======= 1 failed, 341 passed, 51 skipped, 9 deselected in 550.97 seconds =======
2016-06-27 17:06:08 +02:00
Frederik Rietdijk
f44e70a68b pypy.withPackages: fix path 2016-05-31 17:17:28 +02:00
Frederik Rietdijk
3502599730 pypy.withPackages
was forgotten in https://github.com/NixOS/nixpkgs/pull/15804
2016-05-31 16:01:07 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Frederik Rietdijk
6c51676476 Merge pull request #15366 from bendlas/update-pypy
pypy: 4.0.1 -> 5.1.1
2016-05-15 13:12:11 +02:00
Herwig Hochleitner
668f9159ab pypy: deactivate test_zipfile64 again 2016-05-11 18:33:36 +02:00
Herwig Hochleitner
e87cbf9fa3 pypy: revise test expression 2016-05-10 19:51:06 +02:00
Herwig Hochleitner
14e73a6e6f pypy: 4.0.1 -> 5.1.1 2016-05-10 19:49:53 +02:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
f8472457a4 pypy: fix build with multiple outputs 2016-01-12 23:57:48 +01:00
Domen Kožar
5c2c881c57 pypy: parallel build improvements, remove some patching
incorporates http://paste.pound-python.org/show/oFyMaSSzvb07lenWYmAK/
from NixCon sprints
2016-01-11 20:42:00 +01:00
Corbin Simpson
da698fd9da pypy: add some required build inputs and disable some unsafe tests
I had to disable another networking-centric test suite; it was trying to make
unapproved phone calls.
2016-01-11 20:42:00 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Herwig Hochleitner
a92a40e8a1 pypy: 4.0.0 -> 4.0.1 2015-12-01 11:45:13 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Herwig Hochleitner
481a9ada06 pypy: 2.6.0 -> 4.0.0 2015-11-21 21:44:12 +01:00
Domen Kožar
fc2874d02e pypy: use the official sitePackages install path 2015-11-21 21:44:12 +01:00
Vladimír Čunát
90d5e87862 sqlite: split dev and bin outputs 2015-10-14 14:27:07 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Thomas Tuegel
ce79122119 pypy: wrap original, not symlink 2015-08-26 09:35:48 -05:00
Samuel Rivas
b454ff7cbb Add sitePackages to pypy's passthru 2015-07-21 14:16:29 +02:00
Vincent Laporte
4efbe96205 pypy: fix two libraries (ZHF) 2015-07-17 19:00:16 +02:00
Vincent Laporte
1c5c4e91d7 pypy: fix build (ZHF) 2015-07-15 19:40:56 +02:00
Domen Kožar
4227b13af6 pypy: 2.5.1 -> 2.6.0 2015-06-11 10:42:14 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Ricardo M. Correia
372f7e0a13 pypy: Update from 2.5.0 -> 2.5.1 2015-05-03 01:19:39 +02:00
William A. Kennington III
d8c949cc26 Make tcl and tk versions generic 2015-04-26 21:30:01 -07:00
Domen Kožar
c0d814d62b pypy: fix build 2015-02-08 20:43:44 +01:00
Domen Kožar
a3e23f6535 fix eval 2015-02-04 14:11:33 +01:00
Domen Kožar
d75a91ef1e pypy: 2.4 -> 2.5 2015-02-04 13:21:20 +01:00
Dario Bertini
57577f2019
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds 2015-01-24 10:38:54 +00:00
Georges Dubus
c2f8791e83 pypy: added patch to fix build with gcc 4.9.2 2015-01-14 16:02:08 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Domen Kožar
8bfd6af9ed pypy: disable whole ssl test suit instead of a single test
(cherry picked from commit 118fd6f526618ec6fc243bc2cdf89a99c4172d9a)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 17:13:24 +01:00
Domen Kožar
5819f29875 pypy: disable cpickle test.. 2014-12-15 14:17:39 +01:00
Domen Kožar
dc626a9f5c pypy: disable test_default_ciphers test 2014-11-15 19:32:05 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Domen Kožar
39d1bc755e python: add python.interpreter attribute 2014-11-13 00:42:36 +01:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
2d6582d14e python27FullBuildEnv -> python.buildEnv for all interpreters 2014-10-19 19:48:18 +02:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Domen Kožar
d589684cae pypy: disable test_zipfile64 because timeouts 2014-10-16 11:14:42 +02:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Bjørn Forsman
25e726b283 pypy: fix copy-paste error in setup-hook
Introduced in 428fdc879f
("pypy: 2.3 -> 2.4").
2014-09-26 20:10:06 +02:00
Domen Kožar
4fa05bdc6f pypy: disable test_urllib2net and test_urllibnet 2014-09-26 18:12:49 +02:00
Domen Kožar
3aefa63c75 pypy: pytest syntax change 2014-09-26 18:12:37 +02:00
Domen Kožar
428fdc879f pypy: 2.3 -> 2.4 2014-09-26 18:12:24 +02:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00