Merge staging-next into staging

3 files changed, 24 insertions, 26 deletions

diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 48bd37677421..ff0cb4aa3fe0 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/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/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 38050bc09a12..23940ef14995 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/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/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index f4d1ef829bb4..cf3cd3272a8e 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/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;
   };
 }