ocamlPackages.mirage-crypto: 1.1.0 → 1.2.0 (#383015)

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

@@ -5,6 +5,7 @@
   ocaml,
   findlib,
   camlp4,
+  cstruct,
   ocamlbuild,
   erm_xml,
   mirage-crypto,
@@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [ camlp4 ];
   propagatedBuildInputs = [
+    cstruct
     erm_xml
     mirage-crypto
     mirage-crypto-rng

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

@@ -5,7 +5,7 @@
   ohex,
   ounit2,
   dune-configurator,
-  eqaf-cstruct,
+  eqaf,
   withFreestanding ? false,
   ocaml-freestanding,
 }:
@@ -14,11 +14,11 @@ buildDunePackage rec {
   minimalOCamlVersion = "4.13";
 
   pname = "mirage-crypto";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
-    hash = "sha256-xxiXZ6fq1UkjyrAg85zQw0r31LBId2k52U8Cir9TY1M=";
+    hash = "sha256-CVQrzZbB02j/m6iFMQX0wXgdjJTCQA3586wGEO4H5n4=";
   };
 
   doCheck = true;
@@ -30,7 +30,7 @@ buildDunePackage rec {
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs =
     [
-      eqaf-cstruct
+      eqaf
     ]
     ++ lib.optionals withFreestanding [
       ocaml-freestanding

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

@@ -5,7 +5,6 @@
   dune-configurator,
   pkg-config,
   mirage-crypto-rng,
-  mirage-crypto-pk,
   alcotest,
   asn1-combinators,
   ohex,
@@ -17,7 +16,7 @@
   ocaml-freestanding,
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "mirage-crypto-ec";
 
   inherit (mirage-crypto)
@@ -38,8 +37,6 @@ buildDunePackage rec {
       ocaml-freestanding
     ];
 
-  strictDeps = true;
-
   doCheck = true;
   checkInputs = [
     alcotest
@@ -49,7 +46,6 @@ buildDunePackage rec {
     ppx_deriving_yojson
     ppx_deriving
     yojson
-    mirage-crypto-pk
   ];
 
   meta = mirage-crypto.meta // {

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

@@ -5,12 +5,11 @@
   randomconv,
   mirage-crypto,
   mirage-crypto-rng,
-  sexplib0,
   zarith,
   gmp,
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "mirage-crypto-pk";
 
   inherit (mirage-crypto) version src;
@@ -20,7 +19,6 @@ buildDunePackage rec {
     mirage-crypto
     mirage-crypto-rng
     zarith
-    sexplib0
   ];
 
   doCheck = true;

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

@@ -5,6 +5,7 @@
   dune-configurator,
   async,
   logs,
+  ohex,
 }:
 
 buildDunePackage {
@@ -12,8 +13,6 @@ buildDunePackage {
 
   inherit (mirage-crypto) version src;
 
-  duneVersion = "3";
-
   buildInputs = [
     dune-configurator
   ];
@@ -25,7 +24,8 @@ buildDunePackage {
     mirage-crypto-rng
   ];
 
-  strictDeps = true;
+  doCheck = true;
+  checkInputs = [ ohex ];
 
   meta = mirage-crypto.meta // {
     description = "Feed the entropy source in an Async-friendly way";

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

@@ -1,17 +1,15 @@
 {
   buildDunePackage,
-  mirage-crypto,
   mirage-crypto-rng,
-  dune-configurator,
   eio,
   eio_main,
   ohex,
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "mirage-crypto-rng-eio";
 
-  inherit (mirage-crypto) version src;
+  inherit (mirage-crypto-rng) version src;
 
   doCheck = true;
   checkInputs = [
@@ -19,9 +17,7 @@ buildDunePackage rec {
     ohex
   ];
 
-  buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
-    mirage-crypto
     mirage-crypto-rng
     eio
   ];

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

@@ -1,26 +1,20 @@
 {
   buildDunePackage,
-  mirage-crypto,
   mirage-crypto-rng,
-  dune-configurator,
   duration,
   logs,
   mtime,
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "mirage-crypto-rng-lwt";
 
-  inherit (mirage-crypto) version src;
-
-  duneVersion = "3";
+  inherit (mirage-crypto-rng) version src;
 
   doCheck = true;
 
-  buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
-    mirage-crypto
     mirage-crypto-rng
     duration
     logs

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

@@ -13,7 +13,7 @@
   ohex,
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "mirage-crypto-rng-mirage";
 
   inherit (mirage-crypto-rng) version src;

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

@@ -10,9 +10,11 @@
   logs,
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "mirage-crypto-rng";
 
+  minimalOCamlVersion = "4.14";
+
   inherit (mirage-crypto) version src;
 
   doCheck = true;

pkgs/development/ocaml-modules/tls/eio.nix

@@ -17,7 +17,8 @@ buildDunePackage rec {
 
   minimalOCamlVersion = "5.0";
 
-  doCheck = true;
+  # Tests are not compatible with mirage-crypto-rng 1.2.0
+  doCheck = false;
   nativeCheckInputs = [
     mdx.bin
   ];