cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
ocamlPackages.mirage-unix: 4.0.1 → 5.0.1; mirage-crypto: 0.10.5 → 0.10.7
This commit is contained in:
superherointj 2022-09-15 14:48:29 -03:00 committed by GitHub
commit 1b8ac331bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/ocaml-modules/mirage-crypto/default.nix
View file

@ -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 , withFreestanding ? false
, ocaml-freestanding , ocaml-freestanding
}: }:
buildDunePackage rec { buildDunePackage rec {
minimumOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
pname = "mirage-crypto"; pname = "mirage-crypto";
version = "0.10.5"; version = "0.10.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU="; sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";
}; };
useDune2 = true;
doCheck = true; doCheck = true;
checkInputs = [ ounit ]; checkInputs = [ ounit2 ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]; buildInputs = [ dune-configurator ];

4
pkgs/development/ocaml-modules/mirage-crypto/ec.nix
View file

@ -21,10 +21,8 @@ buildDunePackage rec {
pname = "mirage-crypto-ec"; pname = "mirage-crypto-ec";
inherit (mirage-crypto) inherit (mirage-crypto)
minimumOCamlVersion
src src
version version;
useDune2;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [

6
pkgs/development/ocaml-modules/mirage-crypto/pk.nix
View file

@ -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 }: , cstruct, sexplib0, zarith, eqaf, gmp }:
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-crypto-pk"; pname = "mirage-crypto-pk";
inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; inherit (mirage-crypto) version src;
buildInputs = [ gmp ]; buildInputs = [ gmp ];
propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
@ -13,7 +13,7 @@ buildDunePackage rec {
strictDeps = !doCheck; strictDeps = !doCheck;
doCheck = true; doCheck = true;
checkInputs = [ ounit randomconv ]; checkInputs = [ ounit2 randomconv ];
meta = mirage-crypto.meta // { meta = mirage-crypto.meta // {
description = "Simple public-key cryptography for the modern age"; description = "Simple public-key cryptography for the modern age";

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

@ -6,7 +6,7 @@
buildDunePackage { buildDunePackage {
pname = "mirage-crypto-rng-async"; pname = "mirage-crypto-rng-async";
inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; inherit (mirage-crypto) version src;
buildInputs = [ buildInputs = [
dune-configurator dune-configurator

2
pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
View file

@ -6,7 +6,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-crypto-rng-mirage"; pname = "mirage-crypto-rng-mirage";
inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; inherit (mirage-crypto-rng) version src;
doCheck = true; doCheck = true;
checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];

6
pkgs/development/ocaml-modules/mirage-crypto/rng.nix
View file

@ -1,13 +1,13 @@
{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator { buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator
, cstruct, duration, logs, mtime, ocaml_lwt }: , cstruct, duration, logs, mtime, ocaml_lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-crypto-rng"; pname = "mirage-crypto-rng";
inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; inherit (mirage-crypto) version src;
doCheck = true; doCheck = true;
checkInputs = [ ounit randomconv ]; checkInputs = [ ounit2 randomconv ];
buildInputs = [ dune-configurator ]; buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ];

10
pkgs/development/ocaml-modules/mirage-unix/default.nix
View file

@ -1,15 +1,15 @@
{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }: { lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime }:
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-unix"; pname = "mirage-unix";
version = "4.0.1"; version = "5.0.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4="; sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg=";
}; };
propagatedBuildInputs = [ lwt duration mirage-runtime io-page ]; propagatedBuildInputs = [ lwt duration mirage-runtime ];
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {