Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05:00
..
alex	haskell-alex: update to version 3.0.4	2013-02-20 11:35:36 +01:00
antlr	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
bison	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
byacc
Ebnf2ps	haskell-Ebnf2ps: update to version 1.0.11	2012-08-31 09:10:18 +02:00
flex	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01: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
ragel
re2c	Added re2c 0.13.5	2012-12-02 00:25:01 +01:00