From 92d2950194214e975ae7bd2655036689fccac155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 2 Mar 2023 10:31:29 +0100 Subject: [PATCH] ocamlPackages.mirage-crypto: 0.10.7 -> 0.11.0 Co-authored-by: Vincent Laporte --- .../instant-messengers/jackline/default.nix | 6 ++-- .../development/ocaml-modules/awa/default.nix | 4 +-- .../ocaml-modules/conduit/default.nix | 4 +-- .../ocaml-modules/conduit/mirage.nix | 4 +-- pkgs/development/ocaml-modules/dns/cli.nix | 4 +-- .../ocaml-modules/dns/client-lwt.nix | 30 +++++++++++++++++ .../ocaml-modules/dns/client-mirage.nix | 32 +++++++++++++++++++ pkgs/development/ocaml-modules/dns/client.nix | 14 -------- .../development/ocaml-modules/dns/default.nix | 4 +-- pkgs/development/ocaml-modules/dns/stub.nix | 4 +-- pkgs/development/ocaml-modules/git/unix.nix | 9 +++++- .../ocaml-modules/happy-eyeballs/default.nix | 4 +-- .../ocaml-modules/happy-eyeballs/lwt.nix | 4 +-- .../ocaml-modules/happy-eyeballs/mirage.nix | 4 +-- .../ocaml-modules/letsencrypt/default.nix | 6 ++-- .../ocaml-modules/mirage-crypto/default.nix | 4 +-- .../ocaml-modules/mirage-crypto/rng-lwt.nix | 15 +++++++++ .../ocaml-modules/mirage-crypto/rng.nix | 2 +- pkgs/development/ocaml-modules/paf/cohttp.nix | 1 + .../development/ocaml-modules/paf/default.nix | 8 +++++ pkgs/development/ocaml-modules/paf/le.nix | 5 +-- .../development/ocaml-modules/tls/default.nix | 4 +-- pkgs/development/ocaml-modules/tls/lwt.nix | 19 +++++++++++ .../ocaml-modules/x509/default.nix | 4 +-- pkgs/top-level/ocaml-packages.nix | 8 +++++ 25 files changed, 155 insertions(+), 48 deletions(-) create mode 100644 pkgs/development/ocaml-modules/dns/client-lwt.nix create mode 100644 pkgs/development/ocaml-modules/dns/client-mirage.nix create mode 100644 pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix create mode 100644 pkgs/development/ocaml-modules/tls/lwt.nix diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 5bf231ec924..9178c73a46d 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -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 = [ diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index fd0bf82df34..e8ff5df1a9e 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -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 = [ diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 99f3df49339..ada502aaf0c 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 09c7df5edab..9123c235dd3 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index 6e23eeecba9..8c1ff57bc9b 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix new file mode 100644 index 00000000000..f17b8ed0759 --- /dev/null +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -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; +} diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix new file mode 100644 index 00000000000..2e0768d2b7c --- /dev/null +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -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; +} diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index e8bd210dcd8..bc859945e4e 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 81bc741d974..9012b9d8214 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix index 943d28a57c5..343f4925b18 100644 --- a/pkgs/development/ocaml-modules/dns/stub.nix +++ b/pkgs/development/ocaml-modules/dns/stub.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index f5e8337382e..680c77dfa39 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index a3a2a3cff1f..b70c6af0f8e 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -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 = [ diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index 50f1f945573..6d2ef3b8057 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index eb15706efac..bc3341a422f 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 13875147a4e..9fdff45b6a5 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index d5f110948dc..816709b4cc7 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix new file mode 100644 index 00000000000..f6ec2a9e3da --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-lwt.nix @@ -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; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 044b8ed27b8..97de946bc2c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index 2f289149306..e7e0273e523 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,6 +22,7 @@ buildDunePackage { inherit (paf) version src + patches ; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 974c981f57c..6345499ca28 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix index 429cd0a4d8d..a31575d4690 100644 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ b/pkgs/development/ocaml-modules/paf/le.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index b68edba2728..18506b611f2 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/tls/lwt.nix b/pkgs/development/ocaml-modules/tls/lwt.nix new file mode 100644 index 00000000000..90eefa4347e --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/lwt.nix @@ -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 + ]; +} diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index bd7a7a0fa47..76076039518 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -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 ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7fb8e255198..43e8cba683c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 {