cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/development/tools/ocaml
History
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
camlidl
camlp4 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
camlp5 ocamlPackages.camlp5: 7.07 -> 7.08 2019-08-12 14:36:38 +00:00
cppo
dune dune: add marsam as maintainer 2019-08-23 12:33:38 +00:00
findlib treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
js_of_ocaml treewide: name -> pname 2019-08-17 10:54:38 +00:00
merlin ocamlPackages.merlin: 3.3.1 -> 3.3.2 2019-07-15 16:11:22 +02:00
oasis treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
obelisk treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
obuild treewide: name -> pname 2019-08-17 10:54:38 +00:00
ocaml-top
ocamlbuild
ocamlformat
ocamlify
ocamlmod treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
ocamlscript
ocp-build
ocp-indent
ocp-index
ocsigen-i18n treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
omake treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
opaline treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
opam treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
utop treewide: name -> pname 2019-08-17 10:54:38 +00:00