summaryrefslogtreecommitdiffstats
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-01-04 16:11:20 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2021-01-05 08:55:31 +0100
commit412450dcd771addd3b8119b09871fcf416aedb81 (patch)
tree5c0103fb3220f4459f67aca2e17703fe847e13eb /pkgs/development/ocaml-modules
parentef5cb37c301c7b1e97eb7fb434843368a6a04a9e (diff)
ocamlPackages.mirage-crypto*: 0.8.7 -> 0.8.8
New package: ocamlPackages.mirage-crypto-rng-async
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/mirage-crypto/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix25
-rw-r--r--pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix6
3 files changed, 31 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index f963e8e15d08..c2ede31dd3f1 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -4,11 +4,11 @@ buildDunePackage rec {
minimumOCamlVersion = "4.08";
pname = "mirage-crypto";
- version = "0.8.7";
+ version = "0.8.8";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
- sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy";
+ sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb";
};
useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
new file mode 100644
index 000000000000..e8c8dd06eab5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage
+, mirage-crypto, mirage-crypto-rng
+, dune-configurator, async, logs
+}:
+
+buildDunePackage {
+ pname = "mirage-crypto-rng-async";
+
+ inherit (mirage-crypto) useDune2 version minimumOCamlVersion src;
+
+ nativeBuildInputs = [
+ dune-configurator
+ ];
+
+ propagatedBuildInputs = [
+ async
+ logs
+ mirage-crypto
+ mirage-crypto-rng
+ ];
+
+ meta = mirage-crypto.meta // {
+ description = "Feed the entropy source in an Async-friendly way";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
index 473704d7ea22..5152d3c8ecde 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
@@ -1,5 +1,7 @@
{ buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime
-, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix }:
+, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix
+, logs, lwt
+}:
buildDunePackage {
pname = "mirage-crypto-rng-mirage";
@@ -10,7 +12,7 @@ buildDunePackage {
checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime
- mirage-time mirage-clock ];
+ mirage-time mirage-clock logs lwt ];
meta = mirage-crypto-rng.meta // {
description = "Entropy collection for a cryptographically secure PRNG";