Merge pull request #182319 from vbgl/ocaml-metrics-0.4.0

ocamlPackages.metrics: 0.2.0 → 0.4.0

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 ];

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";

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";

pkgs/development/ocaml-modules/metrics/mirage.nix

@@ -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";
-  };
-}

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";
+  };
+}

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 ];
 

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;