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
bison	bison: update to version 2.6.5	2012-11-09 18:00:49 +01:00
byacc
Ebnf2ps	haskell-Ebnf2ps: update to version 1.0.11	2012-08-31 09:10:18 +02:00
flex
happy	haskell-happy: add version 1.18.10	2012-09-24 12:08:29 +02:00
jikespg
peg
ragel
toolbuslib