Vladimír Čunát 52404a868d Merge recent master into staging ... Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix		2014-11-05 15:00:44 +01:00
..
camlidl
camlp4	Adds camlp4	2014-09-23 09:34:13 +01:00
camlp5	Updates camlp5 6.11 -> 6.12	2014-10-01 00:44:15 +01:00
cppo	cppo: update from 0.9.4 to 1.0.1	2014-10-29 17:43:05 +00:00
deriving	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
findlib	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
js_of_ocaml	Build js_of_ocaml with tyxml support	2014-10-15 11:13:58 +02:00
merlin	merlin: update from 1.7.1 to 2.0	2014-11-03 13:41:46 +00:00
oasis	ocaml-oasis: update from 0.4.4 to 0.4.5	2014-11-04 00:08:58 +00:00
ocamlify	Adds camlp4	2014-09-23 09:34:13 +01:00
ocamlmod	Adds camlp4	2014-09-23 09:34:13 +01:00
ocamlscript	ocamlscript: new derivation	2014-11-02 21:41:24 +00:00
ocp-build	Added ocp-build-1.99.8-beta	2014-10-28 18:05:53 +01:00
ocp-indent	Added ocp-indent-1.4.2b	2014-10-28 18:09:42 +01:00
omake	Fix many package descriptions	2014-08-24 22:31:37 +02:00
opam	opam: update to 1.2.0	2014-11-03 11:55:33 -05:00
utop	ocamlPackages.utop: update from 1.14 to 1.15	2014-10-08 20:23:29 +02:00