Merge staging-next into staging

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

@@ -0,0 +1,29 @@
+{ lib, buildDunePackage, fetchurl
+, bos, fpath, rresult, ptime, mirage-crypto, x509
+}:
+
+buildDunePackage rec {
+  pname = "ca-certs";
+  version = "0.1.2";
+
+  minimumOCamlVersion = "4.07";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
+    sha256 = "10bbqbrsqcmslz56zc5407knalh3kqypbm7lblnzzbidbapa9wpz";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 ];
+
+  # tests need access to network and systemwide ca cert chain
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Detect root CA certificates from the operating system";
+    maintainers = [ maintainers.sternenseemann ];
+    license = licenses.isc;
+    homepage = "https://github.com/mirage/ca-certs";
+  };
+}

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

@@ -1,8 +1,10 @@
-{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo, lablgtk, stdio }:
+{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo
+, graphics, lablgtk, stdio
+}:
 
 buildDunePackage rec {
   pname = "camlimages";
-  version = "5.0.3";
+  version = "5.0.4";
 
   useDune2 = true;
 
@@ -12,10 +14,10 @@ buildDunePackage rec {
     owner = "camlspotter";
     repo = pname;
     rev = version;
-    sha256 = "1ng9pkvrzlibfyf97iqvmbsqcykz8v1ln106xhq9nigih5i68zyd";
+    sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4";
   };
 
-  buildInputs = [ dune-configurator cppo lablgtk stdio ];
+  buildInputs = [ dune-configurator cppo graphics lablgtk stdio ];
 
   meta = with lib; {
     branch = "5.0";

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

@@ -1,21 +1,23 @@
-{ lib, buildDunePackage, fetchFromGitHub, alcotest, result }:
+{ lib, buildDunePackage, fetchFromGitHub, ocaml, alcotest, result }:
 
 buildDunePackage rec {
   pname = "dispatch";
-  version = "0.4.1";
+  version = "0.5.0";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-dispatch";
     rev = version;
-    sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr";
+    sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4";
   };
 
   propagatedBuildInputs = [ result ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
-  doCheck = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
 
   meta = {
     inherit (src.meta) homepage;

pkgs/development/ocaml-modules/mirage-unix/default.nix

@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "mirage-unix";
   version = "4.0.0";
 
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
     sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj";

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

@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, ocaml
+, functoria, mirage-runtime
+}:
+
+buildDunePackage rec {
+  pname = "mirage";
+  inherit (mirage-runtime) version src;
+
+  useDune2 = true;
+
+  outputs = [ "out" "dev" ];
+
+  propagatedBuildInputs = [ functoria mirage-runtime ];
+
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix=$out --libdir=$dev/lib/ocaml/${ocaml.version}/site-lib/ ${pname}
+    runHook postInstall
+  '';
+
+  meta = mirage-runtime.meta // {
+    description = "The MirageOS library operating system";
+  };
+
+}

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

@@ -5,6 +5,8 @@ buildDunePackage rec {
   pname = "mirage-runtime";
   version = "3.9.0";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.08";
 
   src = fetchurl {

pkgs/development/ocaml-modules/owl-base/default.nix

@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "owl-base";
-  version = "0.10.0";
+  version = "1.0.0";
 
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
-    sha256 = "148ny2cdzga1l36kcibvlz5xlyi5zvkywifxaqn8lf79n1swmlzf";
+    sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr";
   };
 
   minimumOCamlVersion = "4.10";

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

@@ -5,7 +5,6 @@
 , alcotest
 , eigen
 , stdio
-, stdlib-shims
 , openblasCompat
 , owl-base
 , npy
@@ -18,9 +17,9 @@ buildDunePackage rec {
   inherit (owl-base) version src meta useDune2;
 
   checkInputs = [ alcotest ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator stdio ];
   propagatedBuildInputs = [
-    eigen stdio stdlib-shims openblasCompat owl-base npy
+    eigen openblasCompat owl-base npy
   ];
 
   doCheck = !stdenv.isDarwin;  # https://github.com/owlbarn/owl/issues/462

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

@@ -2,16 +2,18 @@
 
 buildDunePackage rec {
   pname = "ppx_blob";
-  version = "0.4.0";
+  version = "0.7.1";
+
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz";
-    sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16";
+    sha256 = "0m616ri6kmawflphiwm6j4djds27v0fjvi8xjz1fq5ydc1sq8d0l";
   };
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
   buildInputs = [ ocaml-migrate-parsetree ];
-  doCheck = lib.versionAtLeast ocaml.version "4.03";
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
 
   meta = with lib; {
     homepage = "https://github.com/johnwhitington/ppx_blob";

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

@@ -5,7 +5,7 @@
 
 buildDunePackage rec {
   pname = "webmachine";
-  version = "0.6.2";
+  version = "0.7.0";
   useDune2 = true;
 
   minimumOCamlVersion = "4.04";
@@ -14,12 +14,12 @@ buildDunePackage rec {
     owner = "inhabitedtype";
     repo = "ocaml-webmachine";
     rev = version;
-    sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk";
+    sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx";
   };
 
   propagatedBuildInputs = [ cohttp dispatch ptime ];
 
-  checkInputs = lib.optional doCheck ounit;
+  checkInputs = [ ounit ];
 
   doCheck = true;