From 9100134ba9902515c6d26f8ac03f1605e29fa405 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Apr 2023 06:17:18 +0200
Subject: [PATCH] ocamlPackages.caqti: use Dune 3

---
 pkgs/development/ocaml-modules/caqti/async.nix             | 2 ++
 pkgs/development/ocaml-modules/caqti/default.nix           | 1 +
 pkgs/development/ocaml-modules/caqti/driver-mariadb.nix    | 2 ++
 pkgs/development/ocaml-modules/caqti/driver-postgresql.nix | 2 ++
 pkgs/development/ocaml-modules/caqti/dynload.nix           | 6 ++++--
 pkgs/development/ocaml-modules/caqti/lwt.nix               | 2 ++
 pkgs/development/ocaml-modules/caqti/type-calendar.nix     | 2 ++
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix
index 14869477077..328cf37986d 100644
--- a/pkgs/development/ocaml-modules/caqti/async.nix
+++ b/pkgs/development/ocaml-modules/caqti/async.nix
@@ -4,6 +4,8 @@ buildDunePackage {
   pname = "caqti-async";
   inherit (caqti) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ];
 
   meta = caqti.meta // { description = "Async support for Caqti"; };
diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix
index 18b55b9857e..2d62ba7e0c6 100644
--- a/pkgs/development/ocaml-modules/caqti/default.nix
+++ b/pkgs/development/ocaml-modules/caqti/default.nix
@@ -8,6 +8,7 @@ buildDunePackage rec {
   version = "1.9.1";
 
   minimalOCamlVersion = "4.04";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
index bff515eff38..859402d83ea 100644
--- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
+++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
@@ -6,6 +6,8 @@ buildDunePackage {
 
   propagatedBuildInputs = [ caqti mariadb ];
 
+  duneVersion = "3";
+
   meta = caqti.meta // {
     description = "MariaDB driver for Caqti using C bindings";
   };
diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
index f33e38fab8d..d48ae1186bf 100644
--- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
+++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
@@ -4,6 +4,8 @@ buildDunePackage {
   pname = "caqti-driver-postgresql";
   inherit (caqti) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ caqti postgresql ];
 
   meta = caqti.meta // {
diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix
index 8e6a30a1a31..dfd52e24dd1 100644
--- a/pkgs/development/ocaml-modules/caqti/dynload.nix
+++ b/pkgs/development/ocaml-modules/caqti/dynload.nix
@@ -1,10 +1,12 @@
-{ lib, buildDunePackage, caqti }:
+{ lib, buildDunePackage, caqti, findlib }:
 
 buildDunePackage {
   pname = "caqti-dynload";
   inherit (caqti) version src;
 
-  propagatedBuildInputs = [ caqti ];
+  duneVersion = "3";
+
+  propagatedBuildInputs = [ caqti findlib ];
 
   meta = caqti.meta // {
     description = "Dynamic linking of Caqti drivers using findlib.dynload";
diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix
index d0642113628..66e5a7ce293 100644
--- a/pkgs/development/ocaml-modules/caqti/lwt.nix
+++ b/pkgs/development/ocaml-modules/caqti/lwt.nix
@@ -4,6 +4,8 @@ buildDunePackage {
   pname = "caqti-lwt";
   inherit (caqti) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ caqti logs lwt ];
 
   meta = caqti.meta // { description = "Lwt support for Caqti"; };
diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix
index 26b0887f20e..db4d5983aed 100644
--- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix
+++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix
@@ -4,6 +4,8 @@ buildDunePackage {
   pname = "caqti-type-calendar";
   inherit (caqti) src version;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ calendar caqti ];
 
   meta = caqti.meta // {