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	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
angelscript	Taking back 32635. An older Rigs of Rods does not work better. Same throttle issues. Let's keep with 0.39.4.	2012-02-28 23:01:25 +00:00
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	Erlang: fix my typo, too	2012-11-12 23:51:45 +04:00
falcon	Adding Falcon multiparadigm programming language. It has macros and non-trivial syntax at once, which seems interesting in itself..	2009-07-09 22:30:19 +00:00
groovy	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
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	Ooops.	2011-10-17 12:59:44 +00:00
j	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
jruby	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00
kaffe	* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl	2007-08-24 12:32:36 +00:00
kona	Update Kona/fix its build	2012-04-12 07:12:07 +00:00
love	love: fix typo in meta.maintainer attribute	2013-02-21 14:28:58 +01:00
lua-4	pkgs/development/interpreters/lua-4/builder.sh: delete obsolete file	2011-07-10 14:04:09 +00:00
lua-5	lua-5.1: build liblua.so and install the pkgconfig file and the documentation	2012-12-25 11:25:56 +01:00
maude	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
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	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
picolisp	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
pure	pure: update and fix by patching	2013-02-17 11:01:20 +01:00
pyrex	Fix Pyrex build	2012-07-18 09:50:36 -04:00
python	Merge branch 'master' into stdenv-updates.	2013-04-07 23:37:12 +02:00
r-lang	pkgs/development/interpreters/r-lang: cosmetic improvements to package description, etc.	2010-11-29 11:13:03 +00:00
racket	racket: enable HTML docs	2013-04-02 11:39:36 +08:00
regina	Adding Regina-REXX interpreter	2011-09-02 08:05:51 +00:00
ruby	ruby19: fix build via a patch-level update	2013-04-10 15:28:54 +02:00
scsh	Add packages scsh, The Scheme Shell	2009-11-07 11:17:53 +00:00
spidermonkey	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
tcl	tcl: Set license to licenses.tcltk.	2012-09-09 07:00:01 +02:00