From ebe4402d0a42452da47486254463995c0ed232a9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Jan 2023 10:34:27 +0100
Subject: [PATCH] ocamlPackages.conduit: use dune 3

---
 pkgs/development/ocaml-modules/conduit/async.nix    | 2 ++
 pkgs/development/ocaml-modules/conduit/default.nix  | 3 ++-
 pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 1 +
 pkgs/development/ocaml-modules/conduit/lwt.nix      | 1 +
 pkgs/development/ocaml-modules/conduit/mirage.nix   | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix
index fb5a96932164..a110e6dc1677 100644
--- a/pkgs/development/ocaml-modules/conduit/async.nix
+++ b/pkgs/development/ocaml-modules/conduit/async.nix
@@ -9,6 +9,8 @@ buildDunePackage {
     src
     ;
 
+  duneVersion = "3";
+
   buildInputs = [ ppx_sexp_conv ppx_here ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index d097ec66ac47..99f3df493396 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -7,7 +7,8 @@ buildDunePackage rec {
   pname = "conduit";
   version = "6.1.0";
 
-  minimalOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index 81a77f356aff..cb86ea5f4f06 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -6,6 +6,7 @@
 buildDunePackage {
   pname = "conduit-lwt-unix";
   inherit (conduit-lwt) version src;
+  duneVersion = "3";
 
   buildInputs = [ ppx_sexp_conv ];
 
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 641d57db10e3..2ec6f556916d 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -3,6 +3,7 @@
 buildDunePackage {
   pname = "conduit-lwt";
   inherit (conduit) version src;
+  duneVersion = "3";
 
   buildInputs = [ ppx_sexp_conv ];
 
diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix
index 61fb9b569b7b..09c7df5edab6 100644
--- a/pkgs/development/ocaml-modules/conduit/mirage.nix
+++ b/pkgs/development/ocaml-modules/conduit/mirage.nix
@@ -9,6 +9,7 @@ buildDunePackage {
   pname = "conduit-mirage";
 
   inherit (conduit-lwt) version src;
+  duneVersion = "3";
 
   nativeBuildInputs = [ ppx_sexp_conv ];