diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-09-13 14:14:19 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-09-15 15:35:45 +0200 |
commit | 5b9a398716f40fabe95502d97ecf7af116a9a852 (patch) | |
tree | cefd63d718511ebe4651535f6ea8c4e731536807 /pkgs/development/ocaml-modules/mirage-crypto | |
parent | fd745268a4f48d25875cc32b17abb0b32f45207e (diff) |
ocamlPackages.mirage-unix: 4.0.1 → 5.0.0
ocamlPackages.mirage-crypto: 0.10.5 → 0.10.6
Diffstat (limited to 'pkgs/development/ocaml-modules/mirage-crypto')
6 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index c942972597ad5..5679b77b32778 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,23 +1,21 @@ -{ 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.6"; 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-AdZHek7crQB7Vpg5VdMn8OYcPzZJSCLzdVAX0m6PlBA="; }; - useDune2 = true; - doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 5506243ec3a4a..098b587f3d59f 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -21,10 +21,8 @@ buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) - minimumOCamlVersion src - version - useDune2; + version; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 9a2b9c98e4587..0793bf5c4f392 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,10 +1,10 @@ -{ 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 @@ -13,7 +13,7 @@ buildDunePackage rec { strictDeps = !doCheck; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index 91da7aa568162..5752507f9ef90 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -6,7 +6,7 @@ buildDunePackage { pname = "mirage-crypto-rng-async"; - inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; + inherit (mirage-crypto) version src; buildInputs = [ dune-configurator diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 8d67ade9b465f..bf940c3eb70c4 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -6,7 +6,7 @@ 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 ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 2281f10580cd2..8900dd611d89c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,13 +1,13 @@ -{ 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 ]; |