Commit graph

63 commits

Author SHA1 Message Date
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
Domen Kožar
df98dda81d pypy: compile also curses 2014-08-30 23:01:09 +02:00
Domen Kožar
17b88f1b09 pypy: wrap to provide sqlite3 at runtime 2014-08-29 13:49:12 +02:00
Domen Kožar
7b7fb63314 pypy: disable test_sqlite again... 2014-08-27 19:04:38 +02:00
Domen Kožar
df30066790 pypy: test sqlite3 and verify the module 2014-08-27 11:20:24 +02:00
Domen Kožar
4f2781019e pypy: properly hint sqlite3 headers 2014-08-26 19:51:39 +02:00
Domen Kožar
0ba31c1e6d pypy: give hints about sqlite3 2014-08-26 12:26:09 +02:00
Domen Kožar
276220262e pypy: hint about tcl/tk headers/libs paths 2014-08-26 09:57:38 +02:00
Domen Kožar
db47d51592 pypy: add X libs to build tkinter 2014-08-25 19:00:37 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Domen Kožar
3df019067d pypy: add tcl support 2014-08-24 17:33:27 +02:00
Domen Kožar
4ac4440e2f pypy: verify tkinter module 2014-08-24 10:16:54 +02:00
Domen Kožar
3194d5cc32 zope.testing: 4.1.2 -> 4.1.3 (also, fix pypy build) 2014-08-23 17:38:28 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Domen Kožar
ad666c56ff pypy: correctly bump the version 2014-06-19 18:16:43 +02:00
Domen Kožar
be976b2c46 pypy: disable a test 2014-06-09 20:42:57 +02:00
Domen Kožar
74bc6252a3 pypy: 2.2.1 -> 2.3.1 2014-06-08 22:10:53 +02:00
Domen Kožar
1d2278f480 pypy: disable sqlite3 tests (failing due to sqlite bump) 2014-05-01 18:38:06 +02:00
Domen Kozar
fedd018d93 fix pypy and pypyPackages 2014-03-07 14:34:06 +01:00
Domen Kožar
4a1e74673a pypy: support only linux for now 2014-02-08 20:27:57 +01:00
Domen Kožar
a23b87a13a pypy: disable a test with transient error #1634 2014-02-08 20:26:23 +01:00
Michael Raskin
f1daf24bea Less aggressive LD_LIBRARY_PATH seems to avoid segfault 2013-12-29 18:52:43 +04:00
Evgeny Egorochkin
ba9e03472c pypy: disable failing test 2013-12-21 07:09:16 +02:00
Nixpkgs Monitor
b8eb00bcde pypy: update from 2.2 to 2.2.1 2013-12-21 02:28:26 +02:00
Domen Kožar
38185f8e51 pypy: 2.1 -> 2.2 2013-11-14 16:22:04 +01:00
Domen Kožar
cbfe6c0e8d pypy: patch ncurses name correctly 2013-08-23 17:05:50 +02:00
Domen Kožar
50c0290f51 pypy: 2.0 -> 2.1 2013-08-23 12:45:46 +02:00