From 88c2586958f4aba99f5ad115bbf0adfb0a17282b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 5 Jul 2019 07:28:06 -0500
Subject: [PATCH] dune: 1.9.2 -> 1.10.0 (#62256)

* dune: 1.9.2 -> 1.10.0

* ocamlPackages.camomile: use jbuilder executable

* ocamlPackages.sqlexpr: fix build

* ocamlPackages.lwt_camlp4: fix build
---
 .../development/ocaml-modules/camomile/default.nix | 14 +++++++++++---
 pkgs/development/ocaml-modules/lwt/camlp4.nix      |  2 ++
 pkgs/development/ocaml-modules/sqlexpr/default.nix |  2 ++
 pkgs/development/tools/ocaml/dune/default.nix      |  8 ++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index f21e7643afe..48bd3767742 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
+{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }:
 
-buildDunePackage rec {
+stdenv.mkDerivation rec {
   pname = "camomile";
 	version = "1.0.1";
 
@@ -11,10 +11,18 @@ buildDunePackage rec {
 		sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
 	};
 
-	buildInputs = [ cppo ];
+	buildInputs = [ ocaml dune findlib 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/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix
index 53f0435f462..fbf920d9621 100644
--- a/pkgs/development/ocaml-modules/lwt/camlp4.nix
+++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix
@@ -15,6 +15,8 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ camlp4 ];
 
+  preBuild = "rm META.lwt_camlp4";
+
   meta = {
     description = "Camlp4 syntax extension for Lwt (deprecated)";
     license = lib.licenses.lgpl21;
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix
index 7d988e27ff0..df6b6f0854d 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix
@@ -15,6 +15,8 @@ buildDunePackage rec {
   propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
   doCheck = true;
 
+  preBuild = "rm META.sqlexpr";
+
   meta = {
     description = "Type-safe, convenient SQLite database access";
     homepage = "https://github.com/mfp/ocaml-sqlexpr";
diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index cf82b391ff9..268890360b6 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, opaline }:
 
 stdenv.mkDerivation rec {
-  name = "dune-${version}";
-  version = "1.9.2";
+  pname = "dune";
+  version = "1.10.0";
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "0l27d13wh3i1450kgxnhr6r977sgby1dqwsfc8cqd9mqic1mr9f2";
+    sha256 = "15fx9rg16g7ig43rg4sdq0wp0br5h1mjxxgv8b15s317vqlfc5pd";
   };
 
   buildInputs = [ ocaml findlib ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://github.com/ocaml/dune;
+    homepage = "https://dune.build/";
     description = "A composable build system";
     maintainers = [ stdenv.lib.maintainers.vbgl ];
     license = stdenv.lib.licenses.mit;