Unverified Commit 1b8ac331 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #191157 from vbgl/ocaml-mirage-unix-5.0.0 

ocamlPackages.mirage-unix: 4.0.1 → 5.0.1; mirage-crypto: 0.10.5 → 0.10.7
parents a529c286 384f3c53

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

+6 −8
Original line number Diff line number Diff line 
{ 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.7";



  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-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";

  };



  useDune2 = true;



  doCheck = true;

  checkInputs = [ ounit ];

  checkInputs = [ ounit2 ];



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ dune-configurator  ];

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

+1 −3
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ buildDunePackage rec { 
  pname = "mirage-crypto-ec";



  inherit (mirage-crypto)

    minimumOCamlVersion

    src

    version

    useDune2;

    version;



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [

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

+3 −3
Original line number Diff line number Diff line 
{ 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";

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

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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 ];