ocamlPackages.mirage-logs: 1.2.0 → 1.3.0

ocamlPackages.mirage-logs: 1.2.0 → 1.3.0

4 files changed, 15 insertions, 13 deletions

diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix
index 7aabd51b819a7..e54a8bc1b3e2f 100644
--- a/pkgs/development/ocaml-modules/mirage-logs/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix
@@ -1,20 +1,20 @@
 { lib, fetchurl, buildDunePackage
-, logs, lwt, mirage-clock, mirage-profile, ptime
-, alcotest, stdlib-shims
+, logs, lwt, mirage-clock, ptime
+, alcotest
 }:
 
 buildDunePackage rec {
   pname = "mirage-logs";
-  version = "1.2.0";
+  version = "1.3.0";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz";
-    sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1";
+    url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz";
+    hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA=";
   };
 
-  propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ];
+  propagatedBuildInputs = [ logs lwt mirage-clock ptime ];
 
   doCheck = true;
   checkInputs = [ alcotest ];
diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix
index ef856e0212730..2aba97944e17e 100644
--- a/pkgs/development/ocaml-modules/mirage-profile/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix
@@ -7,7 +7,7 @@ buildDunePackage rec {
   pname = "mirage-profile";
   version = "0.9.1";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
index 0b4974f910c9d..17dee792007bd 100644
--- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
@@ -2,19 +2,20 @@
 , buildDunePackage
 , fetchurl
 , ppx_cstruct
-, mirage-profile
 , cstruct
+, lwt
 , ounit
-, stdlib-shims
 }:
 
 buildDunePackage rec {
   pname = "shared-memory-ring";
   version = "3.1.1";
 
+  duneVersion = "3";
+
   src = fetchurl {
     url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz";
-    sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU=";
+    hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU=";
   };
 
   buildInputs = [
@@ -22,13 +23,12 @@ buildDunePackage rec {
   ];
 
   propagatedBuildInputs = [
-    mirage-profile
     cstruct
-    stdlib-shims
   ];
 
   doCheck = true;
   checkInputs = [
+    lwt
     ounit
   ];
 
diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
index e3ae1ef2e3dc4..dc34be8ed746e 100644
--- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
@@ -14,6 +14,8 @@ buildDunePackage {
 
   inherit (shared-memory-ring) version src;
 
+  duneVersion = "3";
+
   buildInputs = [
     ppx_cstruct
   ];