Merge pull request #191157 from vbgl/ocaml-mirage-unix-5.0.0

ocamlPackages.mirage-unix: 4.0.1 → 5.0.1; mirage-crypto: 0.10.5 → 0.10.7

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

···
-{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
+{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config
 , withFreestanding ? false
 , ocaml-freestanding
 }:
 
 buildDunePackage rec {
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
 
   pname = "mirage-crypto";
-  version = "0.10.5";
+  version = "0.10.7";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
-    sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU=";
+    url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
+    sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";
   };
 
-  useDune2 = true;
-
   doCheck = true;
-  checkInputs = [ ounit ];
+  checkInputs = [ ounit2 ];
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dune-configurator  ];

pkgs/development/ocaml-modules/mirage-crypto/ec.nix

···
   pname = "mirage-crypto-ec";
 
   inherit (mirage-crypto)
-    minimumOCamlVersion
     src
-    version
-    useDune2;
+    version;
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

pkgs/development/ocaml-modules/mirage-crypto/pk.nix

···
-{ buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng
+{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng
 , cstruct, sexplib0, zarith, eqaf, gmp }:
 
 buildDunePackage rec {
   pname = "mirage-crypto-pk";
 
-  inherit (mirage-crypto) version src useDune2 minimumOCamlVersion;
+  inherit (mirage-crypto) version src;
 
   buildInputs = [ gmp ];
   propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
···
   strictDeps = !doCheck;
 
   doCheck = true;
-  checkInputs = [ ounit randomconv ];
+  checkInputs = [ ounit2 randomconv ];
 
   meta = mirage-crypto.meta // {
     description = "Simple public-key cryptography for the modern age";

pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix

···
 buildDunePackage {
   pname = "mirage-crypto-rng-async";
 
-  inherit (mirage-crypto) useDune2 version minimumOCamlVersion src;
+  inherit (mirage-crypto) version src;
 
   buildInputs = [
     dune-configurator

pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix

···
 buildDunePackage rec {
   pname = "mirage-crypto-rng-mirage";
 
-  inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion;
+  inherit (mirage-crypto-rng) version src;
 
   doCheck = true;
   checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];

pkgs/development/ocaml-modules/mirage-crypto/rng.nix

···
-{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator
+{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator
 , cstruct, duration, logs, mtime, ocaml_lwt }:
 
 buildDunePackage rec {
   pname = "mirage-crypto-rng";
 
-  inherit (mirage-crypto) version src useDune2 minimumOCamlVersion;
+  inherit (mirage-crypto) version src;
 
   doCheck = true;
-  checkInputs = [ ounit randomconv ];
+  checkInputs = [ ounit2 randomconv ];
 
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ];

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

···
-{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }:
+{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime }:
 
 buildDunePackage rec {
   pname = "mirage-unix";
-  version = "4.0.1";
+  version = "5.0.1";
 
   src = fetchurl {
-    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4=";
+    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg=";
   };
 
-  propagatedBuildInputs = [ lwt duration mirage-runtime io-page ];
+  propagatedBuildInputs = [ lwt duration mirage-runtime ];
   doCheck = true;
 
   meta = with lib; {