Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv ... Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix		2014-09-08 18:24:58 +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	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
js_of_ocaml	Add a derivation for js_of_ocaml	2014-09-06 12:44:32 +04:00
merlin	Updates merlin to 1.7.1	2014-08-22 14:56:33 +02:00
oasis	Reexport ocaml data notation in the ocaml-oasis derivation	2014-09-06 12:44:33 +04: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	Fix many package descriptions	2014-08-24 22:31:37 +02:00
opam	Add opam 1.1.1	2014-02-22 19:08:54 +01:00
utop	add utop (improved ocaml toplevel)	2014-08-30 19:37:15 +04:00