ocamlPackages.tls: 0.17.3 → 0.17.5

ocamlPackages.conduit: 6.2.1 → 6.2.3
ocamlPackages.dns: 7.0.1 → 8.0.0
ocamlPackages.git: 3.14.0 → 3.16.1
ocamlPackages.http-mirage-client: 0.0.5 → 0.0.6
ocamlPackages.mimic: 0.0.6 → 0.0.9
ocamlPackages.mirage-flow: 3.0.0 → 4.0.0
ocamlPackages.mirage-vnetif: 0.6.0 → 0.6.2
ocamlPackages.paf: 0.5.0 → 0.6.0
ocamlPackages.tcpip: 8.0.0 → 8.1.0
ocamlPackages.vchan: 6.0.1 → 6.0.2
This commit is contained in:
Vincent Laporte 2024-08-12 06:39:58 +02:00 committed by Vincent Laporte
parent 8bcc5c9e25
commit 1f92ee7ad7
23 changed files with 53 additions and 79 deletions

View File

@ -23,6 +23,7 @@ buildDunePackage rec {
buildInputs = [ buildInputs = [
erm_xmpp erm_xmpp
tls tls
tls-lwt
mirage-crypto-pk mirage-crypto-pk
x509 x509
domain-name domain-name

View File

@ -5,13 +5,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "conduit"; pname = "conduit";
version = "6.2.1"; version = "6.2.3";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
hash = "sha256-WdXntiQ3vkibC3nOEf+QrATvOcaD5M78qFh6/cL1W7s="; hash = "sha256-OkaEuxSFsfJH1ghN0KNW4QJ+ksLNRns1yr1Zp2RCPnk=";
}; };
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];

View File

@ -3,13 +3,13 @@
, ipaddr, alcotest , ipaddr, alcotest
, ca-certs , ca-certs
, happy-eyeballs , happy-eyeballs
, happy-eyeballs-lwt
, tls-lwt , tls-lwt
}: }:
buildDunePackage { buildDunePackage {
pname = "dns-client-lwt"; pname = "dns-client-lwt";
inherit (dns) src version; inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
dns dns
@ -18,6 +18,7 @@ buildDunePackage {
lwt lwt
ca-certs ca-certs
happy-eyeballs happy-eyeballs
happy-eyeballs-lwt
tls-lwt tls-lwt
mtime mtime
mirage-crypto-rng mirage-crypto-rng

View File

@ -3,6 +3,7 @@
, domain-name, ipaddr , domain-name, ipaddr
, ca-certs-nss , ca-certs-nss
, happy-eyeballs , happy-eyeballs
, happy-eyeballs-mirage
, tcpip , tcpip
, tls, tls-mirage , tls, tls-mirage
}: }:
@ -10,7 +11,6 @@
buildDunePackage { buildDunePackage {
pname = "dns-client-mirage"; pname = "dns-client-mirage";
inherit (dns) src version; inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
dns-client dns-client
@ -22,6 +22,7 @@ buildDunePackage {
mirage-clock mirage-clock
ca-certs-nss ca-certs-nss
happy-eyeballs happy-eyeballs
happy-eyeballs-mirage
tcpip tcpip
tls tls
tls-mirage tls-mirage

View File

@ -6,7 +6,6 @@
buildDunePackage { buildDunePackage {
pname = "dns-client"; pname = "dns-client";
inherit (dns) src version; inherit (dns) src version;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
dns dns

View File

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

View File

@ -1,32 +1,27 @@
{ stdenv, lib, fetchurl, buildDunePackage { stdenv, lib, fetchurl, buildDunePackage
, alcotest, mirage-crypto-rng, git-binary , alcotest, mirage-crypto-rng, git-binary
, angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum , angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd , ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd
, result, bigstringaf, optint, mirage-flow, domain-name, emile , result, bigstringaf, optint, mirage-flow, domain-name, emile
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "git"; pname = "git";
version = "3.14.0"; version = "3.16.1";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
hash = "sha256-u1Nq8zo2YfAnRXib+IqYV0sWOGraqxrJC33NdDQaYsE="; hash = "sha256-wDW9zM2eTS9IxtnNxl5h/BCDjs8dim8qN2riCoqSSAM=";
}; };
# remove changelog for the carton package
postPatch = ''
rm CHANGES.carton.md
'';
buildInputs = [ buildInputs = [
base64 base64
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
angstrom astring checkseum cstruct decompress digestif encore fmt fpath angstrom astring checkseum cstruct decompress digestif encore fmt
ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
]; ];

View File

@ -11,7 +11,6 @@
, tls , tls
, tls-mirage , tls-mirage
, uri , uri
, hex
, happy-eyeballs-mirage , happy-eyeballs-mirage
, happy-eyeballs , happy-eyeballs
, ca-certs-nss , ca-certs-nss
@ -26,10 +25,7 @@
, lwt , lwt
, mirage-clock , mirage-clock
, mirage-flow , mirage-flow
, mirage-random
, mirage-time , mirage-time
, result
, rresult
, alcotest , alcotest
, alcotest-lwt , alcotest-lwt
, bigstringaf , bigstringaf
@ -49,8 +45,6 @@ buildDunePackage {
dns-client dns-client
happy-eyeballs-mirage happy-eyeballs-mirage
ipaddr ipaddr
mirage-random
rresult
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -64,7 +58,6 @@ buildDunePackage {
tls tls
tls-mirage tls-mirage
uri uri
hex
happy-eyeballs happy-eyeballs
ca-certs-nss ca-certs-nss
mirage-crypto mirage-crypto
@ -78,7 +71,6 @@ buildDunePackage {
mirage-clock mirage-clock
mirage-flow mirage-flow
mirage-time mirage-time
result
]; ];
checkInputs = [ checkInputs = [

View File

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

View File

@ -1,7 +1,7 @@
{ buildDunePackage { buildDunePackage
, happy-eyeballs , happy-eyeballs
, cmdliner , cmdliner
, dns-client-lwt , dns
, duration , duration
, domain-name , domain-name
, ipaddr , ipaddr
@ -17,7 +17,6 @@ buildDunePackage {
inherit (happy-eyeballs) src version; inherit (happy-eyeballs) src version;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
buildInputs = [ buildInputs = [
cmdliner cmdliner
@ -29,7 +28,7 @@ buildDunePackage {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
dns-client-lwt dns
happy-eyeballs happy-eyeballs
logs logs
lwt lwt

View File

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

View File

@ -16,13 +16,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "http-mirage-client"; pname = "http-mirage-client";
version = "0.0.5"; version = "0.0.6";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
hash = "sha256-w/dMv5QvgglTFj9V4wRoDqK+36YeE0xWLxcAVS0oHz0="; hash = "sha256-rtl76NJRYwSRNgN57v0KwUlcDsGQ2MR+y5ZDVf4Otjs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,22 +1,20 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, fmt, mirage-flow, cstruct, logs, ke, lwt , mirage-flow, cstruct, logs, ke, lwt
, alcotest, alcotest-lwt, bigstringaf , alcotest, alcotest-lwt, bigstringaf
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "mimic"; pname = "mimic";
version = "0.0.6"; version = "0.0.9";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
sha256 = "sha256-gVvBj4NqqKR2mn944g9F0bFZ8Me+WC87skti0dBW3Cg="; hash = "sha256-lU3xzrVIqSKnhUQIhaXRamr39zXWw3DtNdM5EUtp4p8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
fmt
lwt lwt
mirage-flow mirage-flow
logs logs

View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, mimic, happy-eyeballs-mirage }: { lib, buildDunePackage, dns-client-mirage, mimic, happy-eyeballs-mirage }:
buildDunePackage { buildDunePackage {
pname = "mimic-happy-eyeballs"; pname = "mimic-happy-eyeballs";
@ -6,11 +6,9 @@ buildDunePackage {
inherit (mimic) src version; inherit (mimic) src version;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
strictDeps = true;
propagatedBuildInputs = [ propagatedBuildInputs = [
dns-client-mirage
mimic mimic
happy-eyeballs-mirage happy-eyeballs-mirage
]; ];

View File

@ -2,14 +2,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-flow"; pname = "mirage-flow";
version = "3.0.0"; version = "4.0.2";
duneVersion = "3";
minimalOCamlVersion = "4.05"; minimalOCamlVersion = "4.05";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-${version}.tbz";
hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; hash = "sha256-SGXj3S4b53O9JENUFuMl3I+QoiZ0QSrYu7zTet7q+1o=";
}; };
propagatedBuildInputs = [ cstruct fmt lwt ]; propagatedBuildInputs = [ cstruct fmt lwt ];

View File

@ -1,19 +1,18 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, lwt, mirage-net , lwt, mirage-net
, cstruct, ipaddr, macaddr, mirage-profile , cstruct, ipaddr, macaddr
, duration, logs , duration, logs
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-vnetif"; pname = "mirage-vnetif";
version = "0.6.0"; version = "0.6.2";
minimalOCamlVersion = "4.06"; minimalOCamlVersion = "4.06";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
hash = "sha256-fzRoNFqdnj4Ke+eNdo5crvbnKDx6/+dQyu+K3rD5dYw="; hash = "sha256-SorcrPRhhCYhHasLQGHvTtLo229/3xVB6f7/XOlFRSI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -22,7 +21,6 @@ buildDunePackage rec {
cstruct cstruct
ipaddr ipaddr
macaddr macaddr
mirage-profile
duration duration
logs logs
]; ];

View File

@ -23,8 +23,6 @@ buildDunePackage {
src src
; ;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
paf paf
cohttp-lwt cohttp-lwt

View File

@ -23,11 +23,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "paf"; pname = "paf";
version = "0.5.0"; version = "0.6.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
hash = "sha256-oWRvwb8DhtF3ltWaZ6moKmgadFUngruo1UOIaGNV/oM="; hash = "sha256-uvNezux0V4mwbxU07zCfCYXOgCYKPxshOKiiAjLef9k=";
}; };
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";

View File

@ -1,6 +1,7 @@
{ lib { lib
, buildDunePackage , buildDunePackage
, fetchurl , fetchurl
, fetchpatch
, mirage-crypto-rng , mirage-crypto-rng
, mtime , mtime
, gluon , gluon
@ -21,6 +22,13 @@ buildDunePackage rec {
hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE="; hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE=";
}; };
# Compatibility with tls 0.17.5
patches = fetchpatch {
url = "https://github.com/riot-ml/riot/commit/bbbf0efce6dc84afba84e84cc231ce7ef2dcaa91.patch";
hash = "sha256-qsPuEpur5DohOGezSTpOyBq9WxnY9OS6+w2Ls0tZkT8=";
includes = [ "riot/lib/ssl.ml" ];
};
propagatedBuildInputs = [ propagatedBuildInputs = [
gluon gluon
mirage-crypto-rng mirage-crypto-rng

View File

@ -5,7 +5,7 @@
, macaddr, macaddr-cstruct, fmt , macaddr, macaddr-cstruct, fmt
, lwt, lwt-dllist, logs, duration, randomconv, ethernet , lwt, lwt-dllist, logs, duration, randomconv, ethernet
, alcotest, mirage-flow, mirage-vnetif, pcap-format , alcotest, mirage-flow, mirage-vnetif, pcap-format
, mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test , mirage-clock-unix, arp, ipaddr-cstruct, mirage-crypto-rng
, lru, metrics , lru, metrics
, withFreestanding ? false , withFreestanding ? false
, ocaml-freestanding , ocaml-freestanding
@ -13,11 +13,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "tcpip"; pname = "tcpip";
version = "8.0.0"; version = "8.1.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
hash = "sha256-NrTBVr4WcCukxteBotqLoUYrIjcNFVcOERYFbL8CUjM="; hash = "sha256-hrpdkvkHi93GUxL2O19M40/SVw12VDOyOiJquE11qcA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -52,7 +52,7 @@ buildDunePackage rec {
doCheck = true; doCheck = true;
checkInputs = [ checkInputs = [
alcotest alcotest
mirage-random-test mirage-crypto-rng
mirage-flow mirage-flow
mirage-vnetif mirage-vnetif
pcap-format pcap-format

View File

@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, lwt, ptime, x509 , cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509
, ipaddr , ipaddr
, alcotest, cstruct-unix, ounit2, randomconv , alcotest, cstruct-unix, ounit2
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "tls"; pname = "tls";
version = "0.17.3"; version = "0.17.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz";
hash = "sha256-R+XezdMO0cNnc2RYpjrgd0dBR7PdZ1wUWQuBqS1QMdQ="; hash = "sha256-iRCIV786b4VyKSWo1KP1nCkdY4wPLi/EXw/a+JKuSBk=";
}; };
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
@ -25,7 +25,6 @@ buildDunePackage rec {
mirage-crypto-ec mirage-crypto-ec
mirage-crypto-pk mirage-crypto-pk
mirage-crypto-rng mirage-crypto-rng
lwt
ptime ptime
x509 x509
ipaddr ipaddr
@ -36,7 +35,6 @@ buildDunePackage rec {
alcotest alcotest
cstruct-unix cstruct-unix
ounit2 ounit2
randomconv
]; ];
meta = with lib; { meta = with lib; {

View File

@ -1,5 +1,5 @@
{ buildDunePackage, tls { buildDunePackage, tls
, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-flow, mirage-kv, ptime, x509 , fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime, x509
}: }:
buildDunePackage { buildDunePackage {
@ -11,7 +11,6 @@ buildDunePackage {
lwt lwt
mirage-clock mirage-clock
mirage-crypto mirage-crypto
mirage-crypto-ec
mirage-crypto-pk mirage-crypto-pk
mirage-flow mirage-flow
mirage-kv mirage-kv

View File

@ -1,37 +1,31 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, ppx_cstruct, ppx_sexp_conv, ounit , ounit2
, lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport , lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport
, sexplib, cmdliner
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "vchan"; pname = "vchan";
version = "6.0.1"; version = "6.0.2";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz";
hash = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; hash = "sha256-fki12lrWuIweGX/vSD2gbMX9qaM4KthiDZLeJYWcX+U=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
ppx_cstruct
ppx_sexp_conv
lwt lwt
cstruct cstruct
io-page io-page
mirage-flow mirage-flow
xenstore xenstore
xenstore_transport xenstore_transport
sexplib
]; ];
doCheck = true; doCheck = true;
checkInputs = [ checkInputs = [
cmdliner ounit2
ounit
]; ];
meta = with lib; { meta = with lib; {