ocamlPackages.mirage-crypto: 0.10.3 -> 0.10.5; ocamlPackages.otr: 0.3.8 -> 0.3.10 (#149783)

* ocamlPackages.mirage-crypto: 0.10.3 -> 0.10.5

https://github.com/mirage/mirage-crypto/releases/tag/v0.10.4
https://github.com/mirage/mirage-crypto/releases/tag/v0.10.5

Co-authored-by: sternenseemann <sternenseemann@systemli.org>

* ocamlPackages.otr: 0.3.8 -> 0.3.10

https://github.com/hannesm/ocaml-otr/releases/tag/v0.3.9
https://github.com/hannesm/ocaml-otr/releases/tag/v0.3.10

* ocamlPackages.awa: propagate ppx_sexp_conv as a normal build input

awa depends on ppx_sexp_conv.runtime_lib, so it needs to be
propagated. This was previously masked by the dependency being
propagated from another package.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>

4 files changed, 14 insertions, 13 deletions

diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
index 9f0e252c3e20e..4316d06d9351a 100644
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@@ -18,12 +18,13 @@ buildDunePackage rec {
     sha256 = "1l7nsd8jifxjq78xyzcc0z9igc02m2qlvv4cxzsgdim6n1jfzxj2";
   };
 
-  nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ];
+  nativeBuildInputs = [ ppx_cstruct ];
 
   propagatedBuildInputs = [
     mirage-crypto mirage-crypto-rng mirage-crypto-pk x509
     cstruct cstruct-sexp sexplib mtime
     logs base64 hacl_x25519 zarith
+    ppx_sexp_conv
   ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index f1ca1fef70284..102d3d2de07ee 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, bigarray-compat, pkg-config
+{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
 , withFreestanding ? false
 , ocaml-freestanding
 }:
@@ -7,11 +7,11 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.08";
 
   pname = "mirage-crypto";
-  version = "0.10.3";
+  version = "0.10.5";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
-    sha256 = "a27910365d59b02c3f0e8a40d93a5b81835acf832e1ffa596ee772b41e8a900b";
+    sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU=";
   };
 
   useDune2 = true;
@@ -21,7 +21,7 @@ buildDunePackage rec {
 
   nativeBuildInputs = [ dune-configurator pkg-config ];
   propagatedBuildInputs = [
-    cstruct eqaf bigarray-compat
+    cstruct eqaf
   ] ++ lib.optionals withFreestanding [
     ocaml-freestanding
   ];
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
index d6c4d494510da..82400b5da7c2b 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
@@ -1,5 +1,5 @@
 { buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng
-, cstruct, sexplib, ppx_sexp_conv, zarith, eqaf, rresult, gmp }:
+, cstruct, sexplib0, zarith, eqaf, gmp }:
 
 buildDunePackage {
   pname = "mirage-crypto-pk";
@@ -8,7 +8,7 @@ buildDunePackage {
 
   buildInputs = [ gmp ];
   propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
-                            zarith eqaf rresult sexplib ppx_sexp_conv ];
+                            zarith eqaf sexplib0 ];
 
   doCheck = true;
   checkInputs = [ ounit randomconv ];
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
index cec5d2ee0d075..d2ed78d51b8a2 100644
--- a/pkgs/development/ocaml-modules/otr/default.nix
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -1,24 +1,24 @@
 { lib, fetchurl, buildDunePackage
-, cstruct, sexplib0, rresult, mirage-crypto, mirage-crypto-pk, astring, base64
-, mirage-crypto-rng
+, cstruct, sexplib0, mirage-crypto, mirage-crypto-pk, astring, base64
 }:
 
 buildDunePackage rec {
   pname = "otr";
-  version = "0.3.8";
+  version = "0.3.10";
+
+  minimumOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz";
-    sha256 = "18hn9l8wznqnlh2jf1hpnp36f1cx80ncwiiivsbj34llhgp3893d";
+    sha256 = "0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq";
   };
 
   useDune2 = true;
 
   propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk
-                            astring rresult base64 ];
+                            astring base64 ];
 
   doCheck = true;
-  checkInputs = [ mirage-crypto-rng ];
 
   meta = with lib; {
     homepage = "https://github.com/hannesm/ocaml-otr";