From b174387ba919dddd50e347f18012343dcb6ba4fa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2023 06:04:25 +0100
Subject: [PATCH] =?UTF-8?q?ocamlPackages.macaddr:=205.3.0=20=E2=86=92=205.?=
 =?UTF-8?q?4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ipaddr/cstruct.nix  | 2 ++
 pkgs/development/ocaml-modules/ipaddr/default.nix  | 7 +++++--
 pkgs/development/ocaml-modules/ipaddr/sexp.nix     | 6 ++++--
 pkgs/development/ocaml-modules/macaddr/cstruct.nix | 2 ++
 pkgs/development/ocaml-modules/macaddr/default.nix | 9 +++++----
 pkgs/development/ocaml-modules/macaddr/sexp.nix    | 6 ++++--
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
index c2621584f34..07abfc96734 100644
--- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
@@ -7,6 +7,8 @@ buildDunePackage rec {
 
   inherit (ipaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ ipaddr cstruct ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index c4eefb637fb..6e1170375dc 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage
 , macaddr, domain-name, stdlib-shims
-, ounit, ppx_sexp_conv
+, ounit2, ppx_sexp_conv
 }:
 
 buildDunePackage rec {
@@ -8,9 +8,12 @@ buildDunePackage rec {
 
   inherit (macaddr) version src;
 
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
+
   propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
 
-  checkInputs = [ ppx_sexp_conv ounit ];
+  checkInputs = [ ppx_sexp_conv ounit2 ];
   doCheck = true;
 
   meta = macaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
index 373b5a87e49..a74236c5aa0 100644
--- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
@@ -1,5 +1,5 @@
 { lib, buildDunePackage
-, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv
+, ipaddr, ipaddr-cstruct, ounit2, ppx_sexp_conv
 }:
 
 buildDunePackage rec {
@@ -7,9 +7,11 @@ buildDunePackage rec {
 
   inherit (ipaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ ipaddr ];
 
-  checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ];
+  checkInputs = [ ipaddr-cstruct ounit2 ppx_sexp_conv ];
   doCheck = true;
 
   meta = ipaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix
index db543c0574e..863491e0b7f 100644
--- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix
@@ -7,6 +7,8 @@ buildDunePackage {
 
   inherit (macaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ macaddr cstruct ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix
index 7eb74ff064d..ab2126843a2 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@@ -1,19 +1,20 @@
 { lib, fetchurl, buildDunePackage
-, ppx_sexp_conv, ounit
+, ppx_sexp_conv, ounit2
 }:
 
 buildDunePackage rec {
   pname = "macaddr";
-  version = "5.3.0";
+  version = "5.4.0";
 
   minimalOCamlVersion = "4.04";
+  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
-    sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";
+    hash = "sha256-WmYpG/cQtF9+lVDs1WIievUZ1f7+iZ2hufsdD1HHNeo=";
   };
 
-  checkInputs = [ ppx_sexp_conv ounit ];
+  checkInputs = [ ppx_sexp_conv ounit2 ];
   doCheck = true;
 
   meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix
index 1f03c1326a5..5d096dfecec 100644
--- a/pkgs/development/ocaml-modules/macaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix
@@ -1,5 +1,5 @@
 { lib, buildDunePackage
-, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit
+, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit2
 }:
 
 buildDunePackage {
@@ -7,9 +7,11 @@ buildDunePackage {
 
   inherit (macaddr) version src;
 
+  duneVersion = "3";
+
   propagatedBuildInputs = [ ppx_sexp_conv ];
 
-  checkInputs = [ macaddr-cstruct ounit ];
+  checkInputs = [ macaddr-cstruct ounit2 ];
   doCheck = true;
 
   meta = macaddr.meta // {