Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
acl2
angelscript
clisp	Fix clisp 2.44.1 (needed by stumpwm).	2013-05-01 14:33:00 +02:00
clojure	Add clojureUnstable (clojure 1.5.0-RC1).	2013-01-27 20:43:38 -05:00
cython	cython: set platforms	2013-05-04 22:20:27 +02:00
dart	Adjusted to point to version URL (hosted by me -- had to).	2013-04-17 16:54:03 +02:00
erlang
falcon
groovy
guile	guile: fix non-GNU builds	2013-04-21 12:06:45 +02:00
hiphopvm	gperftools: Update to 2.0 and fix build	2013-01-28 17:19:01 +01:00
io
j
jruby
kaffe
kona
love	love: fix typo in meta.maintainer attribute	2013-02-21 14:28:58 +01:00
lua-4
lua-5
maude
octave	octave: update to 3.6.4	2013-03-17 22:05:14 +01:00
perl	perl: remove one more unreliable test, fixes #454	2013-04-07 21:52:24 +02:00
php	Merge pull request #440 from bbenoist/master	2013-04-22 22:31:57 -07:00
php-xdebug
picolisp
pure	pure: update and fix by patching	2013-02-17 11:01:20 +01:00
pyrex
python	Merge branch 'master' into stdenv-updates.	2013-04-07 23:37:12 +02:00
r-lang
racket	racket: enable HTML docs	2013-04-02 11:39:36 +08:00
regina
ruby	ruby19: fix build via a patch-level update	2013-04-10 15:28:54 +02:00
scsh
spidermonkey
tcl