Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/development/libraries/poppler/default.nix

2014-10-16 15:16:50 +02: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

Minor modifications of some ocaml packages:

2014-09-21 11:02:55 +01: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

Add a derivation for js_of_ocaml

2014-09-06 12:44:32 +04:00

merlin

Minor modifications of some ocaml packages:

2014-09-21 11:02:55 +01:00

oasis

ocaml-oasis: adds missing dependency to caml4

2014-10-10 17:00:30 +01:00

ocamlify

Adds camlp4

2014-09-23 09:34:13 +01:00

ocamlmod

Adds camlp4

2014-09-23 09:34:13 +01:00

omake

Fix many package descriptions

2014-08-24 22:31:37 +02:00

opam

Minor modifications of some ocaml packages:

2014-09-21 11:02:55 +01:00

utop

ocamlPackages.utop: update from 1.14 to 1.15

2014-10-08 20:23:29 +02:00