From 1f7ab584cf86c10466c35046f4880a388f8dcf21 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 17 Jul 2022 14:33:14 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.metrics:=200.2.0=20=E2=86=92=200.?=
 =?UTF-8?q?4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.metrics-mirage: remove at 0.2.0
ocamlPackages.metrics-rusage: init at 0.4.0
---
 .../ocaml-modules/metrics/default.nix          | 10 ++++------
 .../ocaml-modules/metrics/influx.nix           |  6 +++---
 pkgs/development/ocaml-modules/metrics/lwt.nix |  6 +++---
 .../ocaml-modules/metrics/mirage.nix           | 14 --------------
 .../ocaml-modules/metrics/rusage.nix           | 18 ++++++++++++++++++
 .../development/ocaml-modules/metrics/unix.nix |  6 +++---
 pkgs/top-level/ocaml-packages.nix              |  2 +-
 7 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/metrics/mirage.nix
 create mode 100644 pkgs/development/ocaml-modules/metrics/rusage.nix

diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
index 58fcab5313a2..5fcf7cf51108 100644
--- a/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -2,15 +2,13 @@
 
 buildDunePackage rec {
   pname = "metrics";
-  version = "0.2.0";
+  version = "0.4.0";
 
-  useDune2 = true;
-
-  minimumOCamlVersion = "4.04";
+  minimalOCamlVersion = "4.04";
 
   src = fetchurl {
-    url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
-    sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg";
+    url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz";
+    sha256 = "sha256-kbh1WktQkDcXE8O1WRm+vtagVfSql8S5gr0bXn/jia8=";
   };
 
   propagatedBuildInputs = [ fmt ];
diff --git a/pkgs/development/ocaml-modules/metrics/influx.nix b/pkgs/development/ocaml-modules/metrics/influx.nix
index 8394ec0c0f94..cca344f991c2 100644
--- a/pkgs/development/ocaml-modules/metrics/influx.nix
+++ b/pkgs/development/ocaml-modules/metrics/influx.nix
@@ -1,12 +1,12 @@
 { buildDunePackage, metrics
-, astring, duration, fmt, lwt
+, duration, fmt, lwt
 }:
 
 buildDunePackage rec {
   pname = "metrics-influx";
-  inherit (metrics) version useDune2 src;
+  inherit (metrics) version src;
 
-  propagatedBuildInputs = [ astring duration fmt lwt metrics ];
+  propagatedBuildInputs = [ duration fmt lwt metrics ];
 
   meta = metrics.meta // {
     description = "Influx reporter for the Metrics library";
diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/pkgs/development/ocaml-modules/metrics/lwt.nix
index 7085ff58148b..088a4e586ccb 100644
--- a/pkgs/development/ocaml-modules/metrics/lwt.nix
+++ b/pkgs/development/ocaml-modules/metrics/lwt.nix
@@ -1,11 +1,11 @@
-{ buildDunePackage, logs, ocaml_lwt, metrics }:
+{ buildDunePackage, logs, lwt, metrics }:
 
 buildDunePackage {
   pname = "metrics-lwt";
 
-  inherit (metrics) version useDune2 src;
+  inherit (metrics) version src;
 
-  propagatedBuildInputs = [ logs ocaml_lwt metrics ];
+  propagatedBuildInputs = [ logs lwt metrics ];
 
   meta = metrics.meta // {
     description = "Lwt backend for the Metrics library";
diff --git a/pkgs/development/ocaml-modules/metrics/mirage.nix b/pkgs/development/ocaml-modules/metrics/mirage.nix
deleted file mode 100644
index 4a891505ac71..000000000000
--- a/pkgs/development/ocaml-modules/metrics/mirage.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ buildDunePackage, metrics, metrics-influx
-, cstruct, ipaddr, logs, lwt, mirage-clock, mirage-stack
-}:
-
-buildDunePackage {
-  pname = "metrics-mirage";
-  inherit (metrics) version useDune2 src;
-
-  propagatedBuildInputs = [ cstruct ipaddr logs lwt metrics metrics-influx mirage-clock mirage-stack ];
-
-  meta = metrics.meta // {
-    description = "Mirage backend for the Metrics library";
-  };
-}
diff --git a/pkgs/development/ocaml-modules/metrics/rusage.nix b/pkgs/development/ocaml-modules/metrics/rusage.nix
new file mode 100644
index 000000000000..8e93823c21b8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/rusage.nix
@@ -0,0 +1,18 @@
+{ lib, buildDunePackage, metrics
+, fmt, logs
+}:
+
+buildDunePackage {
+  pname = "metrics-rusage";
+  inherit (metrics) src version;
+
+  minimalOCamlVersion = "4.08";
+
+  propagatedBuildInputs = [ fmt logs metrics ];
+
+  doCheck = true;
+
+  meta = metrics.meta // {
+    description = "Resource usage (getrusage) sources for the Metrics library";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix
index 5a7bae1b29f3..2d1333f74a10 100644
--- a/pkgs/development/ocaml-modules/metrics/unix.nix
+++ b/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -1,12 +1,12 @@
-{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
+{ buildDunePackage, gnuplot, lwt, metrics, metrics-lwt, mtime, uuidm }:
 
 buildDunePackage rec {
 
   pname = "metrics-unix";
 
-  inherit (metrics) version useDune2 src;
+  inherit (metrics) version src;
 
-  propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
+  propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ];
 
   checkInputs = [ metrics-lwt ];
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1955f962b7c7..8add11f3d593 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -801,7 +801,7 @@ let
 
     metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
 
-    metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { };
+    metrics-rusage = callPackage ../development/ocaml-modules/metrics/rusage.nix { };
 
     metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {
       inherit (pkgs) gnuplot;