From b9e07a88a2932fd6314c285e9314612f77376b13 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 9 Mar 2023 18:19:14 +0100
Subject: [PATCH] ocamlPackages.mirage-crypto: use Dune 3

---
 pkgs/development/ocaml-modules/mirage-crypto/default.nix    | 1 +
 pkgs/development/ocaml-modules/mirage-crypto/ec.nix         | 2 ++
 pkgs/development/ocaml-modules/mirage-crypto/pk.nix         | 2 ++
 pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix  | 2 ++
 pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix    | 6 ++++--
 pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix | 1 +
 pkgs/development/ocaml-modules/mirage-crypto/rng.nix        | 1 +
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index 816709b4cc78..73d0c4fee7cd 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -5,6 +5,7 @@
 
 buildDunePackage rec {
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   pname = "mirage-crypto";
   version = "0.11.0";
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
index 3afe582413f5..b17182a5efda 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
@@ -24,6 +24,8 @@ buildDunePackage rec {
     src
     version;
 
+  duneVersion = "3";
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     dune-configurator
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
index b79f49c64bd4..e50838e50bbb 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
@@ -6,6 +6,8 @@ buildDunePackage rec {
 
   inherit (mirage-crypto) version src;
 
+  duneVersion = "3";
+
   buildInputs = [ gmp ];
   propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
                             zarith eqaf sexplib0 ];
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
index 5752507f9ef9..b9979b446d20 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
@@ -8,6 +8,8 @@ buildDunePackage {
 
   inherit (mirage-crypto) version src;
 
+  duneVersion = "3";
+
   buildInputs = [
     dune-configurator
   ];
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix
index f6ec2a9e3dae..bcaac601c95c 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix
@@ -1,15 +1,17 @@
 { buildDunePackage, mirage-crypto, mirage-crypto-rng, dune-configurator
-, duration, logs, mtime, ocaml_lwt }:
+, duration, logs, mtime, lwt }:
 
 buildDunePackage rec {
   pname = "mirage-crypto-rng-lwt";
 
   inherit (mirage-crypto) version src;
 
+  duneVersion = "3";
+
   doCheck = true;
 
   buildInputs = [ dune-configurator ];
-  propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng duration logs mtime ocaml_lwt ];
+  propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng duration logs mtime lwt ];
 
   meta = mirage-crypto-rng.meta;
 }
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
index c3703a5a60ab..3e0cde29c52d 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
@@ -7,6 +7,7 @@ buildDunePackage rec {
   pname = "mirage-crypto-rng-mirage";
 
   inherit (mirage-crypto-rng) version src;
+  duneVersion = "3";
 
   doCheck = true;
   checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
index 97de946bc2cc..bbc7823e1f09 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
@@ -5,6 +5,7 @@ buildDunePackage rec {
   pname = "mirage-crypto-rng";
 
   inherit (mirage-crypto) version src;
+  duneVersion = "3";
 
   doCheck = true;
   checkInputs = [ ounit2 randomconv ];