diff options
author | sternenseemann <git@lukasepple.de> | 2020-05-21 00:57:24 +0200 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-05-21 21:11:21 +0200 |
commit | 2d51940df5755a542413f1b99f88b8d03f652991 (patch) | |
tree | ef2383c60b5407380a47aa05bfb9f48ab22a5bc0 /pkgs/development/ocaml-modules | |
parent | 0684381e27169d7a5be6ae4a2d362babd0509dd3 (diff) | |
download | nixlib-2d51940df5755a542413f1b99f88b8d03f652991.tar nixlib-2d51940df5755a542413f1b99f88b8d03f652991.tar.gz nixlib-2d51940df5755a542413f1b99f88b8d03f652991.tar.bz2 nixlib-2d51940df5755a542413f1b99f88b8d03f652991.tar.lz nixlib-2d51940df5755a542413f1b99f88b8d03f652991.tar.xz nixlib-2d51940df5755a542413f1b99f88b8d03f652991.tar.zst nixlib-2d51940df5755a542413f1b99f88b8d03f652991.zip |
ocamlPackages.mirage-crypto{,-pk,-rng}: 0.6.2 → 0.7.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/mirage-crypto/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/mirage-crypto/rng.nix | 11 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 2ca41800baf2..f78ed2ef77f3 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,28 +1,23 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, ocplib-endian -, cpuid, dune-configurator, cpuAcceleration ? false }: +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, pkg-config }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "08xq49cxn66yi0gfajzi8czcxfx24rd191rvf7s10wfkz304sa72"; + sha256 = "0k7kllv3bh192yj6p9dk2z81r56w7x2kyr46pxygb5gnhqqxcncf"; }; useDune2 = true; - preBuild = '' - MIRAGE_CRYPTO_ACCELERATE=${lib.boolToString cpuAcceleration} - ''; - doCheck = true; checkInputs = [ ounit ]; - nativeBuildInputs = [ cpuid dune-configurator ]; - propagatedBuildInputs = [ cstruct ocplib-endian ]; + nativeBuildInputs = [ dune-configurator pkg-config ]; + propagatedBuildInputs = [ cstruct ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index b70a4d37d0d5..3a12580f89f2 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,14 +1,19 @@ -{ buildDunePackage, mirage-crypto, ounit, randomconv, cstruct }: +{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator +, cstruct, duration, logs, mtime, ocaml_lwt, mirage-runtime, mirage-time +, mirage-clock, mirage-time-unix, mirage-clock-unix, mirage-unix }: buildDunePackage { pname = "mirage-crypto-rng"; - inherit (mirage-crypto) version src nativeBuildInputs useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; doCheck = true; checkInputs = [ ounit randomconv ]; - propagatedBuildInputs = [ cstruct mirage-crypto ]; + nativeBuildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt + mirage-runtime mirage-time mirage-clock mirage-time-unix + mirage-clock-unix mirage-unix ]; meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; |