Merge branch 'master' into staging-next

There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940

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 ];

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;

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";