Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
alex	Reverting some more Haskell changes, to make things complete again.	2012-05-10 14:23:48 +00:00
antlr	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
bison	bison: update to version 2.6.5	2012-11-09 18:00:49 +01:00
byacc	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
Ebnf2ps	haskell-Ebnf2ps: update to version 1.0.11	2012-08-31 09:10:18 +02:00
flex	Make cross-buildable	2011-11-04 21:31:07 +00:00
happy	haskell-happy: add version 1.18.10	2012-09-24 12:08:29 +02:00
jikespg	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
peg	Add peg, http://piumarta.com/software/peg/	2011-08-10 09:54:22 +00:00
ragel	replacing applyAndFun by lib.defaultOverridableDelayableArgs	2009-03-06 23:21:28 +00:00
toolbuslib	* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl	2007-08-24 12:32:36 +00:00