mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Code Issues Wiki Activity
53700 commits 339 branches 124 tags 6.9 GiB
Commit graph

12 commits

Author SHA1 Message Date
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