Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
camlidl
camlp5	Update camlp5 to version 6.11	2014-01-18 20:56:44 +00:00
cppo	Adds cppo	2014-06-25 10:25:14 +02:00
deriving	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
findlib	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
merlin	merlin: some cleaning of the derivation	2014-08-01 09:42:37 +02:00
oasis	Add OCaml Oasis	2014-01-31 12:01:32 +01:00
ocamlify	Add OCaml Oasis	2014-01-31 12:01:32 +01:00
ocamlmod	Add OCaml Oasis	2014-01-31 12:01:32 +01:00
omake	Forgotten to add wanr.patch for omake.	2013-06-07 21:58:19 +02:00
opam	Add opam 1.1.1	2014-02-22 19:08:54 +01:00