Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'

16 files changed, 218 insertions, 61 deletions

diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index 48bd37677421..ff0cb4aa3fe0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }:
+{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
 
-stdenv.mkDerivation rec {
+buildDunePackage rec {
   pname = "camomile";
-	version = "1.0.1";
+	version = "1.0.2";
 
 	src = fetchFromGitHub {
 		owner = "yoriyuki";
 		repo = pname;
 		rev = version;
-		sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
+		sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
 	};
 
-	buildInputs = [ ocaml dune findlib cppo ];
+	buildInputs = [ cppo ];
 
 	configurePhase = "ocaml configure.ml --share $out/share/camomile";
 
-  # Use jbuilder executable because it breaks on dune>=1.10
-  # https://github.com/yoriyuki/Camomile/commit/505202b58e22628f80bbe15ee76b9470a5bd2f57#r33816944
-  buildPhase = ''
-    jbuilder build -p ${pname}
-  '';
-
-  inherit (dune) installPhase;
-
 	meta = {
 		inherit (src.meta) homepage;
 		maintainers = [ stdenv.lib.maintainers.vbgl ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
index 0a1a30a34730..271ec1f2af91 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -8,8 +8,8 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
-    version = "1.0.3";
-    sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna";
+    version = "1.0.4";
+    sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
   } else {
     version = "1.0.2";
     sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
index c00af00b859f..2542b5dd9138 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "elpi";
-  version = "1.4.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "LPCIC";
     repo = "elpi";
     rev = "v${version}";
-    sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w";
+    sha256 = "0740a9bg33g7r3injpalmn2jd0h586481vrrkdw46nsaspwcjhza";
   };
 
   minimumOCamlVersion = "4.04";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix
new file mode 100644
index 000000000000..b4980240c902
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, buildDunePackage, markup }:
+
+buildDunePackage rec {
+  pname = "lambdasoup";
+  version = "0.6.3"; # NB: double-check the license when updating
+
+  src = fetchFromGitHub {
+    owner = "aantron";
+    repo = pname;
+    rev = version;
+    sha256 = "1w4zp3vswijzvrx0c3fv269ncqwnvvrzc46629nnwm9shwv07vmv";
+  };
+
+  propagatedBuildInputs = [ markup ];
+
+  meta = {
+    description = "Functional HTML scraping and rewriting with CSS in OCaml";
+    homepage = "https://aantron.github.io/lambdasoup/";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix
new file mode 100644
index 000000000000..ad3b1337977f
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, fetchFromGitHub, cppo }:
+
+buildDunePackage rec {
+  pname = "merlin-extend";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "let-def";
+    repo = pname;
+    sha256 = "1dxiqmm7ry24gvw6p9n4mrz37mnq4s6m8blrccsv3rb8yq82acx9";
+    rev = "v${version}";
+  };
+
+  buildInputs = [ cppo ];
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "SDK to extend Merlin";
+    license = licenses.mit;
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/merlin_extend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/merlin_extend/default.nix
deleted file mode 100644
index 79b8b69bbb57..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/merlin_extend/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, buildOcaml, fetchFromGitHub, cppo }:
-
-buildOcaml rec {
-  name = "merlin_extend";
-  version = "0.3";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchFromGitHub {
-    owner = "let-def";
-    repo = "merlin-extend";
-    sha256 = "1z6hybcb7ry0bkzjd0r2dlcgjnhhxdsr06x3h03sj7h5fihsc7vd";
-    rev = "v${version}";
-  };
-
-  buildInputs = [ cppo ];
-
-  createFindlibDestdir = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/let-def/merlin-extend;
-    description = "SDK to extend Merlin";
-    license = licenses.mit;
-    maintainers = [ maintainers.volth ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/minisat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/minisat/default.nix
new file mode 100644
index 000000000000..79820b16e6ca
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/minisat/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, fetchFromGitHub }:
+
+buildDunePackage rec {
+  pname = "minisat";
+  version = "0.2";
+
+  minimumOCamlVersion = "4.05";
+
+  src = fetchFromGitHub {
+    owner  = "c-cube";
+    repo   = "ocaml-minisat";
+    rev    = version;
+    sha256 = "1jibylmb1ww0x42n6wl8bdwicaysgxp0ag244x7w5m3jifq3xs6q";
+  };
+
+  meta = {
+    homepage = https://c-cube.github.io/ocaml-minisat/;
+    description = "Simple bindings to Minisat-C";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 22215b8da0dc..cd9d9f2d150e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }:
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
 
 let
   pname = "ocaml-cairo";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ocaml automake gnum4 autoconf unzip
-                  findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ];
+                  findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
 
   createFindlibDestdir = true;
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 38050bc09a12..23940ef14995 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
    pname = "ocaml-migrate-parsetree";
-   version = "1.2.0";
+   version = "1.4.0";
 
    src = fetchFromGitHub {
      owner = "ocaml-ppx";
      repo = pname;
      rev = "v${version}";
-     sha256 = "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm";
+     sha256 = "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2";
    };
 
    propagatedBuildInputs = [ ppx_derivers result ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
new file mode 100644
index 000000000000..12f1440118af
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildOasisPackage, minisat }:
+
+buildOasisPackage rec {
+  pname = "ocaml-sat-solvers";
+  version = "0.4";
+
+  minimumOCamlVersion = "4.03.0";
+
+  src = fetchFromGitHub {
+    owner  = "tcsprojects";
+    repo   = "ocaml-sat-solvers";
+    rev    = "v${version}";
+    sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938";
+  };
+
+  propagatedBuildInputs = [ minisat ];
+
+  meta = {
+    homepage = https://github.com/tcsprojects/ocaml-sat-solvers;
+    description = "SAT Solvers For OCaml";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
index f4d1ef829bb4..cf3cd3272a8e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, calendar, csv, re }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4
+, ppx_tools_versioned, result, rresult
+, calendar, csv, hex, re
+}:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4"
+if !stdenv.lib.versionAtLeast ocaml.version "4.05"
 then throw "pgocaml is not available for OCaml ${ocaml.version}"
 else
 
-buildOcaml {
-  name = "pgocaml";
-  version = "2.3";
-  src = fetchurl {
-    url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz;
-    sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-pgocaml-${version}";
+  version = "3.2";
+  src = fetchFromGitHub {
+    owner = "darioteixeira";
+    repo = "pgocaml";
+    rev = "v${version}";
+    sha256 = "0jxzr5niv8kdh90pr57b1qb500zkkasxb8b8l7w9cydcfprnlk24";
   };
 
-  buildInputs = [ ];
-  propagatedBuildInputs = [ calendar csv re ];
+  buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned result rresult ];
+  propagatedBuildInputs = [ calendar csv hex re ];
 
-  configureFlags = [ "--enable-p4" ];
+  configureFlags = [ "--enable-p4" "--enable-ppx" ];
 
   createFindlibDestdir = true;
 
@@ -24,5 +29,6 @@ buildOcaml {
     homepage = http://pgocaml.forge.ocamlcore.org/;
     license = licenses.lgpl2;
     maintainers = with maintainers; [ vbgl ];
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pgsolver/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pgsolver/default.nix
new file mode 100644
index 000000000000..5045cb6a0eeb
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/pgsolver/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, buildOasisPackage, ounit, tcslib, ocaml-sat-solvers }:
+
+buildOasisPackage rec {
+  pname = "pgsolver";
+  version = "4.1";
+
+  src = fetchFromGitHub {
+    owner  = "tcsprojects";
+    repo   = "pgsolver";
+    rev    = "v${version}";
+    sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a";
+  };
+
+  buildInputs = [ ounit ];
+  propagatedBuildInputs = [ tcslib ocaml-sat-solvers ];
+
+  meta = {
+    homepage = https://github.com/tcsprojects/pgsolver;
+    description = "A collection of tools for generating, manipulating and - most of all - solving parity games";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
new file mode 100644
index 000000000000..69b276db90ec
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }:
+
+buildDunePackage rec {
+  pname = "secp256k1";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "dakk";
+    repo = "secp256k1-ml";
+    rev = "42c04c93e2ed9596f6378676e944c8cfabfa69d7";
+    sha256 = "1zw2kgg181a9lj1m8z0ybijs8gw9w1kk990avh1bp9x8kc1asffg";
+  };
+
+  buildInputs = [ base stdio configurator secp256k1 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dakk/secp256k1-ml;
+    description = "Elliptic curve library secp256k1 wrapper for Ocaml";
+    license = licenses.mit;
+    maintainers = [ maintainers.vyorkin ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/tcslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tcslib/default.nix
new file mode 100644
index 000000000000..9d1d5a8096cc
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }:
+
+buildOasisPackage rec {
+  pname = "tcslib";
+  version = "0.3";
+
+  minimumOCamlVersion = "4.03.0";
+
+  src = fetchFromGitHub {
+    owner  = "tcsprojects";
+    repo   = "tcslib";
+    rev    = "v${version}";
+    sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi";
+  };
+
+  buildInputs = [ ounit ];
+  propagatedBuildInputs = [ ocaml_extlib num ];
+
+  meta = {
+    homepage = https://github.com/tcsprojects/tcslib;
+    description = "A multi-purpose library for OCaml";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
new file mode 100644
index 000000000000..0e25d9bc6b65
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildDunePackage
+, iso8601, menhir
+}:
+
+buildDunePackage rec {
+  pname = "toml";
+  version = "5.0.0";
+  src = fetchFromGitHub {
+    owner = "ocaml-toml";
+    repo = "to.ml";
+    rev = "v${version}";
+    sha256 = "1505kwcwklcfaxw8wckajm8kc6yrlikmxyhi8f8cpvhlw9ys90nj";
+  };
+
+  buildInputs = [ menhir ];
+  propagatedBuildInputs = [ iso8601 ];
+
+  meta = {
+    description = "Implementation in OCaml of the Toml minimal langage";
+    homepage = "http://ocaml-toml.github.io/To.ml";
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
index 25a83fa79128..36205c7c1ff4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, cppo, ppx_tools, ppx_deriving, result }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-visitors-20180513";
+  name = "ocaml${ocaml.version}-visitors-20190711";
 
   src = fetchurl {
-    url = http://gallium.inria.fr/~fpottier/visitors/visitors-20180513.tar.gz;
-    sha256 = "12j8n9fkl43sd0j78x2zqix8m1vinswl2jgwndd62vmx98f5rl1v";
+    url = http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz;
+    sha256 = "1h794xczfczf573mpwzm4ah9ir1rbbrkqipbh3aflfpdq2mgsbvg";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild cppo ];