From 191539342a8ea9c3dba5b66972b3907abd099d28 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 31 Jul 2023 06:32:41 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.mirage-clock:=203.1.0=20=E2=86=92?=
 =?UTF-8?q?=204.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/ocaml-modules/mirage-clock/default.nix | 10 ++++------
 .../mirage-clock/{freestanding.nix => solo5.nix}       |  4 +---
 pkgs/development/ocaml-modules/mirage-clock/unix.nix   |  2 +-
 pkgs/top-level/ocaml-packages.nix                      |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/development/ocaml-modules/mirage-clock/{freestanding.nix => solo5.nix} (79%)

diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix
index de8cfd311e54..a436f0b59c07 100644
--- a/pkgs/development/ocaml-modules/mirage-clock/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix
@@ -2,15 +2,13 @@
 
 buildDunePackage rec {
   pname = "mirage-clock";
-  version = "3.1.0";
+  version = "4.2.0";
 
-  useDune2 = true;
-
-  minimumOCamlVersion = "4.06";
+  minimalOCamlVersion = "4.06";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz";
-    sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn";
+    url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-${version}.tbz";
+    hash = "sha256-+hfRXVviPHm6dB9ffLiO1xEt4WpEEM6oHHG5gIaImEc=";
   };
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/mirage-clock/freestanding.nix b/pkgs/development/ocaml-modules/mirage-clock/solo5.nix
similarity index 79%
rename from pkgs/development/ocaml-modules/mirage-clock/freestanding.nix
rename to pkgs/development/ocaml-modules/mirage-clock/solo5.nix
index ef278f1cd25b..d787c08e1bb0 100644
--- a/pkgs/development/ocaml-modules/mirage-clock/freestanding.nix
+++ b/pkgs/development/ocaml-modules/mirage-clock/solo5.nix
@@ -4,13 +4,11 @@
 }:
 
 buildDunePackage {
-  pname = "mirage-clock-freestanding";
+  pname = "mirage-clock-solo5";
 
   inherit (mirage-clock)
     version
     src
-    useDune2
-    minimumOCamlVersion
     ;
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/mirage-clock/unix.nix b/pkgs/development/ocaml-modules/mirage-clock/unix.nix
index 355cffaaa157..6489a4d2566b 100644
--- a/pkgs/development/ocaml-modules/mirage-clock/unix.nix
+++ b/pkgs/development/ocaml-modules/mirage-clock/unix.nix
@@ -3,7 +3,7 @@
 buildDunePackage {
   pname = "mirage-clock-unix";
 
-  inherit (mirage-clock) version useDune2 src;
+  inherit (mirage-clock) version src;
 
   buildInputs = [ dune-configurator ];
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index de2acdd372da..00c893af944b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1000,7 +1000,7 @@ let
 
     mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { };
 
-    mirage-clock-freestanding = callPackage ../development/ocaml-modules/mirage-clock/freestanding.nix { };
+    mirage-clock-solo5 = callPackage ../development/ocaml-modules/mirage-clock/solo5.nix { };
 
     mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { };