Merge branch 'master' into python-tests

gnu: Add ocaml-ppx-compare.

* gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable.

gnu: Add ocaml-ppx-bench.

* gnu/packages/ocaml.scm (ocaml-ppx-bench): New variable.

gnu: Add ocaml-ppx-inline-test.

* gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable.

gnu: Add ocaml-ppx-type-conv.

* gnu/packages/ocaml.scm (ocaml-ppx-type-conv): New variable.

gnu: Add ocaml-ppx-deriving.

* gnu/packages/ocaml.scm (ocaml-ppx-deriving): New variable.

gnu: Add ocaml-cppo.

* gnu/packages/ocaml.scm (ocaml-cppo): New variable.

gnu: Add ocaml-ppx-driver.

* gnu/packages/ocaml.scm (ocaml-ppx-driver): New variable.

gnu: Add ocaml-ppx-optcomp.

* gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable.

gnu: Add ocaml-ppx-core.

* gnu/packages/ocaml.scm (ocaml-ppx-core): New variable.

gnu: Add ocaml-fieldslib.

* gnu/packages/ocaml.scm (ocaml-fieldslib): New variable.

Merge branch 'master' into python-tests

gnu: Add ocaml-bin-prot.

* gnu/packages/ocaml.scm (ocaml-bin-prot): New variable.

gnu: Add ocaml-js-build-tools.

* gnu/packages/ocaml.scm (ocaml-js-build-tools): New variable.

gnu: Add ocaml-oasis.

* gnu/packages/ocaml.scm (ocaml-oasis): New variable.

gnu: Add ocaml-fileutils.

* gnu/packages/ocaml.scm (ocaml-fileutils): New variable.

gnu: Add ocaml-expect.

* gnu/packages/ocaml.scm (ocaml-expect): New variable.

gnu: Add ocaml-pcre.

* gnu/packages/ocaml.scm (ocaml-pcre): New variable.

gnu: Add ocaml-batteries.

* gnu/packages/ocaml.scm (ocaml-batteries): New variable.

gnu: Add omake.

* gnu/packages/ocaml.scm (omake): New variable.
* gnu/packages/patches/omake-fix-non-determinism.patch: New file.
* gnu/local.mk (dist_patch_DATA): New patch.