From 40153f233e9fc8e70e9fb9f18f85ccd3a82bf103 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Apr 2023 14:14:18 +0200
Subject: [PATCH] ocamlPackages.angstrom: use Dune 3

---
 pkgs/development/ocaml-modules/angstrom-async/default.nix | 5 +++--
 .../ocaml-modules/angstrom-lwt-unix/default.nix           | 8 ++++----
 pkgs/development/ocaml-modules/angstrom-unix/default.nix  | 4 ++--
 pkgs/development/ocaml-modules/angstrom/default.nix       | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix
index 8c9f97f81ab..ff390c1598b 100644
--- a/pkgs/development/ocaml-modules/angstrom-async/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix
@@ -3,9 +3,10 @@
 buildDunePackage rec {
   pname = "angstrom-async";
 
-  inherit (angstrom) version useDune2 src;
+  inherit (angstrom) version src;
 
-  minimumOCamlVersion = "4.04.1";
+  duneVersion = "3";
+  minimalOCamlVersion = "4.04.1";
 
   propagatedBuildInputs = [ angstrom async ];
 
diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
index 1bb8833cf07..063f4c1f80c 100644
--- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
@@ -1,13 +1,13 @@
-{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
+{ lib, fetchFromGitHub, buildDunePackage, angstrom, lwt }:
 
 buildDunePackage rec {
   pname = "angstrom-lwt-unix";
 
-  inherit (angstrom) version useDune2 src;
+  inherit (angstrom) version src;
 
-  minimumOCamlVersion = "4.03";
+  duneVersion = "3";
 
-  propagatedBuildInputs = [ angstrom ocaml_lwt ];
+  propagatedBuildInputs = [ angstrom lwt ];
 
   doCheck = true;
 
diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix
index af72c7f8d2d..752b6a48ced 100644
--- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix
@@ -3,9 +3,9 @@
 buildDunePackage rec {
   pname = "angstrom-unix";
 
-  inherit (angstrom) version useDune2 src;
+  inherit (angstrom) version src;
 
-  minimumOCamlVersion = "4.03";
+  duneVersion = "3";
 
   propagatedBuildInputs = [ angstrom ];
 
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 502bd2ad44d..c4f5f98e479 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -3,9 +3,9 @@
 buildDunePackage rec {
   pname = "angstrom";
   version = "0.15.0";
-  useDune2 = true;
+  duneVersion = "3";
 
-  minimumOCamlVersion = "4.04";
+  minimalOCamlVersion = "4.04";
 
   src = fetchFromGitHub {
     owner  = "inhabitedtype";