Merge master into staging-next

pkgs/development/ocaml-modules/ca-certs/default.nix

@@ -1,21 +1,21 @@
 { lib, buildDunePackage, fetchurl
-, bos, fpath, rresult, ptime, mirage-crypto, x509
+, bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs
 }:
 
 buildDunePackage rec {
   pname = "ca-certs";
-  version = "0.1.2";
+  version = "0.1.3";
 
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
-    sha256 = "10bbqbrsqcmslz56zc5407knalh3kqypbm7lblnzzbidbapa9wpz";
+    sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn";
   };
 
   useDune2 = true;
 
-  propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 ];
+  propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ];
 
   # tests need access to network and systemwide ca cert chain
   doCheck = false;

pkgs/development/ocaml-modules/dns/default.nix

@@ -6,6 +6,7 @@ buildDunePackage rec {
   pname = "dns";
   version = "4.6.2";
 
+  useDune2 = true;
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {

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

@@ -2,18 +2,20 @@
 
 buildDunePackage rec {
   pname = "metrics";
-  version = "0.1.0";
+  version = "0.2.0";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.04";
 
   src = fetchurl {
     url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
-    sha256 = "0jy88anrx3rh19046rrbrjmx922zvz3wlqkk8asilqv9pbvpnp1a";
+    sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg";
   };
 
   propagatedBuildInputs = [ fmt ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

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

@@ -0,0 +1,14 @@
+{ buildDunePackage, metrics
+, astring, duration, fmt, lwt
+}:
+
+buildDunePackage rec {
+  pname = "metrics-influx";
+  inherit (metrics) version useDune2 src;
+
+  propagatedBuildInputs = [ astring 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, ocaml_lwt, metrics }:
+{ buildDunePackage, logs, ocaml_lwt, metrics }:
 
 buildDunePackage {
   pname = "metrics-lwt";
 
-  inherit (metrics) version src;
+  inherit (metrics) version useDune2 src;
 
-  propagatedBuildInputs = [ ocaml_lwt metrics ];
+  propagatedBuildInputs = [ logs ocaml_lwt metrics ];
 
   meta = metrics.meta // {
     description = "Lwt backend for the Metrics library";

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

@@ -0,0 +1,14 @@
+{ 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/unix.nix

@@ -1,14 +1,14 @@
-{ lib, buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
+{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
 
 buildDunePackage rec {
 
   pname = "metrics-unix";
 
-  inherit (metrics) version src;
+  inherit (metrics) version useDune2 src;
 
   propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
 
-  checkInputs = lib.optional doCheck metrics-lwt;
+  checkInputs = [ metrics-lwt ];
 
   doCheck = true;