From f6f5188f751cdb9821802eef4e5e680e758eca53 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 29 May 2022 15:05:10 +0200
Subject: [PATCH] =?UTF-8?q?oacmlPackages.odate:=20make=20compatible=20with?=
 =?UTF-8?q?=20menhir=20=E2=89=A5=2020211215?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/odate/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix
index 8967a3815471..24d2c04c6ca6 100644
--- a/pkgs/development/ocaml-modules/odate/default.nix
+++ b/pkgs/development/ocaml-modules/odate/default.nix
@@ -6,9 +6,7 @@ buildDunePackage rec {
   pname = "odate";
   version = "0.6";
 
-  useDune2 = true;
-
-  minimumOCamlVersion = "4.07";
+  minimalOCamlVersion = "4.07";
 
   src = fetchFromGitHub {
     owner = "hhugo";
@@ -21,6 +19,11 @@ buildDunePackage rec {
 
   nativeBuildInputs = [ menhir ];
 
+  # Ensure compatibility of v0.6 with menhir ≥ 20220210
+  preBuild = ''
+    substituteInPlace dune-project --replace "(using menhir 1.0)" "(using menhir 2.0)"
+  '';
+
   meta = {
     description = "Date and duration in OCaml";
     inherit (src.meta) homepage;