nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.mirage-crypto: 0.10.7 -> 0.11.0

Browse Source 
Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
This commit is contained in:
Théo Zimmermann 2023-03-02 10:31:29 +01:00 committed by Vincent Laporte
parent 2a71eb4aff
commit 92d2950194
25 changed files with 155 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/jackline/default.nix
View File

@ -4,7 +4,7 @@ with ocamlPackages;
buildDunePackage rec {
pname = "jackline";
version = "unstable-2022-05-27";
version = "unstable-2023-02-24";
minimalOCamlVersion = "4.08";
@ -13,8 +13,8 @@ buildDunePackage rec {
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
rev = "d8f7c504027a0dd51966b2b7304d6daad155a05b";
hash = "sha256-6SWYl2mB0g8JNVHBeTnZEbzOaTmVbsRMMEs+3j/ewwk=";
rev = "846be4e7fcddf45e66e0ff5b29fb5a212d6ee8c3";
hash = "sha256-/j3VJRx/w9HQUnfoq/4gMWV5oVdRiPGddrgbCDk5y8c=";
};
nativeBuildInpts = [

4
pkgs/development/ocaml-modules/awa/default.nix
View File

@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "awa";
version = "0.1.1";
version = "0.1.2";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo=";
hash = "sha256-HfIqvmvmdizPSfSHthj2syszVZXVhju7tI8yNEetc38=";
};
propagatedBuildInputs = [

4
pkgs/development/ocaml-modules/conduit/default.nix
View File

@ -5,14 +5,14 @@
buildDunePackage rec {
pname = "conduit";
version = "6.1.0";
version = "6.2.0";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
sha256 = "sha256-ouKQiGMLvvksGpAhkqCVSKtKaz91p+7mciQm7KHvwF8=";
sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q=";
};
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];

4
pkgs/development/ocaml-modules/conduit/mirage.nix
View File

@ -1,7 +1,7 @@
{ buildDunePackage, conduit-lwt
, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
, dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
, tcpip, ca-certs-nss
}:
@ -16,7 +16,7 @@ buildDunePackage {
propagatedBuildInputs = [
sexplib uri cstruct mirage-clock mirage-flow
mirage-flow-combinators mirage-random mirage-time
dns-client conduit-lwt vchan xenstore tls tls-mirage
dns-client-mirage conduit-lwt vchan xenstore tls tls-mirage
ipaddr ipaddr-sexp tcpip ca-certs-nss
];

4
pkgs/development/ocaml-modules/dns/cli.nix
View File

@ -1,4 +1,4 @@
{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec
{ buildDunePackage, dns, dns-tsig, dns-client-lwt, dns-server, dns-certify, dnssec
, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
, randomconv, alcotest
@ -17,7 +17,7 @@ buildDunePackage {
buildInputs = [
dns
dns-tsig
dns-client
dns-client-lwt
dns-server
dns-certify
dnssec

30
pkgs/development/ocaml-modules/dns/client-lwt.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
, mirage-random, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
, ca-certs, ca-certs-nss
, happy-eyeballs
, tcpip
, tls-lwt
}:
buildDunePackage {
pname = "dns-client-lwt";
inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [
dns
dns-client
ipaddr
lwt
ca-certs
happy-eyeballs
tls-lwt
mtime
mirage-crypto-rng
];
checkInputs = [ alcotest ];
doCheck = true;
meta = dns-client.meta;
}

32
pkgs/development/ocaml-modules/dns/client-mirage.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
, mirage-random, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
, ca-certs, ca-certs-nss
, happy-eyeballs
, tcpip
, tls, tls-mirage
}:
buildDunePackage {
pname = "dns-client-mirage";
inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [
dns-client
domain-name
ipaddr
lwt
mirage-random
mirage-time
mirage-clock
ca-certs-nss
happy-eyeballs
tcpip
tls
tls-mirage
];
doCheck = true;
meta = dns-client.meta;
}

14
pkgs/development/ocaml-modules/dns/client.nix
View File

@ -13,23 +13,9 @@ buildDunePackage {
duneVersion = "3";
propagatedBuildInputs = [
cstruct
fmt
logs
dns
randomconv
domain-name
ipaddr
lwt
mirage-random
mirage-time
mirage-clock
ca-certs
ca-certs-nss
happy-eyeballs
tcpip
tls
tls-mirage
mtime
mirage-crypto-rng
];

4
pkgs/development/ocaml-modules/dns/default.nix
View File

@ -17,14 +17,14 @@
buildDunePackage rec {
pname = "dns";
version = "6.4.1";
version = "7.0.1";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno=";
hash = "sha256-vDe1U1NbbIPcD1AmMG265ke7651C64mds7KcFHUN4fU=";
};
propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];

4
pkgs/development/ocaml-modules/dns/stub.nix
View File

@ -1,4 +1,4 @@
{ buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig
{ buildDunePackage, dns, dns-client-mirage, dns-mirage, dns-resolver, dns-tsig
, dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
, mirage-random, tcpip, metrics
}:
@ -11,7 +11,7 @@ buildDunePackage {
propagatedBuildInputs = [
dns
dns-client
dns-client-mirage
dns-mirage
dns-resolver
dns-tsig

9
pkgs/development/ocaml-modules/git/unix.nix
View File

@ -1,4 +1,4 @@
{ buildDunePackage, git
{ buildDunePackage, fetchpatch, git
, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@ -14,6 +14,13 @@ buildDunePackage {
pname = "git-unix";
inherit (git) version src;
patches = [
(fetchpatch {
url = "https://github.com/mirage/ocaml-git/commit/b708db8319cc456a5640618210d740a1e00468e9.patch";
hash = "sha256-Fe+eDhU/beZT/8br8XmOhHYJowaVEha16eGqyuu2Zr4=";
})
];
minimalOCamlVersion = "4.08";
duneVersion = "3";

4
pkgs/development/ocaml-modules/happy-eyeballs/default.nix
View File

@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "happy-eyeballs";
version = "0.4.0";
version = "0.5.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ=";
hash = "sha256-T4BOFlSj3xfUFhP9v8UaCHgmhvGrMyeqNUQf79bdBh4=";
};
propagatedBuildInputs = [

4
pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
View File

@ -1,7 +1,7 @@
{ buildDunePackage
, happy-eyeballs
, cmdliner
, dns-client
, dns-client-lwt
, duration
, domain-name
, ipaddr
@ -29,7 +29,7 @@ buildDunePackage {
];
propagatedBuildInputs = [
dns-client
dns-client-lwt
happy-eyeballs
logs
lwt

4
pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
View File

@ -1,7 +1,7 @@
{ buildDunePackage
, happy-eyeballs
, duration
, dns-client
, dns-client-mirage
, domain-name
, ipaddr
, fmt
@ -32,7 +32,7 @@ buildDunePackage {
];
propagatedBuildInputs = [
dns-client
dns-client-mirage
happy-eyeballs
logs
lwt

6
pkgs/development/ocaml-modules/letsencrypt/default.nix
View File

@ -21,11 +21,11 @@
buildDunePackage rec {
pname = "letsencrypt";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA=";
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz";
hash = "sha256-XGroZiNyP0ItOMrXK07nrVqT4Yz9RKXYvZuRkDp089M=";
};
minimalOCamlVersion = "4.08";

4
pkgs/development/ocaml-modules/mirage-crypto/default.nix
View File

@ -7,11 +7,11 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
pname = "mirage-crypto";
version = "0.10.7";
version = "0.11.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz";
sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw=";
sha256 = "sha256-A5SCuVmcIJo3dL0Tu//fQqEV0v3FuCxuANWnBo7hUeQ=";
};
doCheck = true;

15
pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix Normal file
View File

@ -0,0 +1,15 @@
{ buildDunePackage, mirage-crypto, mirage-crypto-rng, dune-configurator
, duration, logs, mtime, ocaml_lwt }:
buildDunePackage rec {
pname = "mirage-crypto-rng-lwt";
inherit (mirage-crypto) version src;
doCheck = true;
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng duration logs mtime ocaml_lwt ];
meta = mirage-crypto-rng.meta;
}

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

@ -10,7 +10,7 @@ buildDunePackage rec {
checkInputs = [ ounit2 randomconv ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ];
strictDeps = true;

1
pkgs/development/ocaml-modules/paf/cohttp.nix
View File

@ -22,6 +22,7 @@ buildDunePackage {
inherit (paf)
version
src
patches
;
duneVersion = "3";

8
pkgs/development/ocaml-modules/paf/default.nix
View File

@ -32,6 +32,14 @@ buildDunePackage rec {
hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE=";
};
patches = [
# Compatibility with mirage-crypto 0.11.0
(fetchpatch {
url = "https://github.com/dinosaure/paf-le-chien/commit/2f308c1c4d3ff49d42136f8ff86a4385661e4d1b.patch";
hash = "sha256-jmSeUpoRoUMPUNEH3Av2LxgRZs+eAectK+CpoH+SdpY=";
})
];
minimalOCamlVersion = "4.08";
duneVersion = "3";

5
pkgs/development/ocaml-modules/paf/le.nix
View File

@ -1,7 +1,7 @@
{ lib
, buildDunePackage
, paf
, dns-client
, dns-client-mirage
, duration
, emile
, httpaf
@ -18,13 +18,14 @@ buildDunePackage {
inherit (paf)
version
src
patches
;
duneVersion = "3";
propagatedBuildInputs = [
paf
dns-client
dns-client-mirage
duration
emile
httpaf

4
pkgs/development/ocaml-modules/tls/default.nix
View File

@ -6,11 +6,11 @@
buildDunePackage rec {
pname = "tls";
version = "0.15.4";
version = "0.16.0";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz";
sha256 = "sha256-X40dVrBvYGnv0dCj3gxFy0iNPRPrfxMshOx7o/DRw4I=";
sha256 = "sha256-uvIDZLNy6E/ce7YmzUUVaOeGRaHqPSUzuEPQDMu09tM=";
};
minimalOCamlVersion = "4.08";

19
pkgs/development/ocaml-modules/tls/lwt.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib, buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, cmdliner, x509 }:
buildDunePackage rec {
pname = "tls-lwt";
inherit (tls) src meta version;
minimalOCamlVersion = "4.11";
duneVersion = "3";
doCheck = true;
propagatedBuildInputs = [
lwt
mirage-crypto-rng-lwt
tls
x509
];
}

4
pkgs/development/ocaml-modules/x509/default.nix
View File

@ -8,13 +8,13 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
pname = "x509";
version = "0.16.2";
version = "0.16.4";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz";
hash = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I=";
hash = "sha256-XegxhdASQK/I7Xd0gJSLumTGbCYFpWsjR7PlZSWqaVo=";
};
checkInputs = [ alcotest cstruct-unix ];

8
pkgs/top-level/ocaml-packages.nix
View File

@ -312,6 +312,10 @@ let
dns-client = callPackage ../development/ocaml-modules/dns/client.nix { };
dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { };
dns-client-mirage = callPackage ../development/ocaml-modules/dns/client-mirage.nix { };
dns-mirage = callPackage ../development/ocaml-modules/dns/mirage.nix { };
dns-resolver = callPackage ../development/ocaml-modules/dns/resolver.nix { };
@ -906,6 +910,8 @@ let
mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { };
mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { };
mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { };
mirage-device = callPackage ../development/ocaml-modules/mirage-device { };
@ -1294,6 +1300,8 @@ let
tls-async = callPackage ../development/ocaml-modules/tls/async.nix { };
tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { };
tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { };
torch = callPackage ../development/ocaml-modules/torch {