From 08eb326add9778c5eb88268ed20e6d1cab43f896 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 29 Mar 2023 06:31:56 +0200
Subject: [PATCH 1/2] ocamlPackages.ocamlformat: use Dune 3

---
 pkgs/development/tools/ocaml/ocamlformat/generic.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
index 325ab8227b72..4ed53aad3789 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
@@ -26,11 +26,8 @@ buildDunePackage {
   pname = "ocamlformat";
   inherit src version;
 
-  minimumOCamlVersion = "4.08";
-
-  useDune2 = true;
-
-  strictDeps = true;
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   nativeBuildInputs = [
     menhir

From 1a10e9255bae88b770197c9891ff408e4cbaafa9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 29 Mar 2023 06:32:02 +0200
Subject: [PATCH 2/2] =?UTF-8?q?ocamlPackages.ocaml-version:=203.4.0=20?=
 =?UTF-8?q?=E2=86=92=203.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocaml-version/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 28f12046eaa3..bbd85889c84d 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -2,19 +2,19 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "3.4.0";
+  version = "3.6.1";
 
   src = fetchurl {
-    url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz";
-    sha256 = "sha256-2MG+tejY67dxC19DTOZqPsi3UrHk1rqHxP4nRSvbiiU=";
+    url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
+    hash = "sha256-AKCaXUehJ3V8uET1tUDDbIzI8lZv5aygxhIbR21xnTI=";
   };
 
   checkInputs = [ alcotest ];
 
   doCheck = true;
 
-  minimumOCamlVersion = "4.07";
-  useDune2 = true;
+  minimalOCamlVersion = "4.07";
+  duneVersion = "3";
 
   meta = with lib; {
     description = "Manipulate, parse and generate OCaml compiler version strings";