diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 946b77512e17..e457d7bdbc35 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -23,6 +23,7 @@ buildDunePackage rec { buildInputs = [ erm_xmpp tls + tls-lwt mirage-crypto-pk x509 domain-name diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index a9fbb02c5fe9..f904fda36a14 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "conduit"; - version = "6.2.1"; + version = "6.2.3"; minimalOCamlVersion = "4.08"; src = fetchurl { 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 ]; diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix index 5e07afe0e012..107e574f5925 100644 --- a/pkgs/development/ocaml-modules/dns/client-lwt.nix +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -3,13 +3,13 @@ , ipaddr, alcotest , ca-certs , happy-eyeballs +, happy-eyeballs-lwt , tls-lwt }: buildDunePackage { pname = "dns-client-lwt"; inherit (dns) src version; - duneVersion = "3"; propagatedBuildInputs = [ dns @@ -18,6 +18,7 @@ buildDunePackage { lwt ca-certs happy-eyeballs + happy-eyeballs-lwt tls-lwt mtime mirage-crypto-rng diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix index f236ac425da2..c400a7145cdb 100644 --- a/pkgs/development/ocaml-modules/dns/client-mirage.nix +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -3,6 +3,7 @@ , domain-name, ipaddr , ca-certs-nss , happy-eyeballs +, happy-eyeballs-mirage , tcpip , tls, tls-mirage }: @@ -10,7 +11,6 @@ buildDunePackage { pname = "dns-client-mirage"; inherit (dns) src version; - duneVersion = "3"; propagatedBuildInputs = [ dns-client @@ -22,6 +22,7 @@ buildDunePackage { mirage-clock ca-certs-nss happy-eyeballs + happy-eyeballs-mirage tcpip tls tls-mirage diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index 78dcd400d185..10d79ef93ad7 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "dns-client"; inherit (dns) src version; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index a4f197274500..dd5a5d786dc3 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -17,14 +17,13 @@ buildDunePackage rec { pname = "dns"; - version = "7.0.1"; + version = "8.0.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { 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 ]; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index c3f27a3c7b97..980a3efa9bd0 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,32 +1,27 @@ { stdenv, lib, fetchurl, buildDunePackage , alcotest, mirage-crypto-rng, git-binary , 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 , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner }: buildDunePackage rec { pname = "git"; - version = "3.14.0"; + version = "3.16.1"; minimalOCamlVersion = "4.08"; src = fetchurl { 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 = [ base64 ]; 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 domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix index 2ae56da0428e..09158c1ba90b 100644 --- a/pkgs/development/ocaml-modules/git/mirage.nix +++ b/pkgs/development/ocaml-modules/git/mirage.nix @@ -11,7 +11,6 @@ , tls , tls-mirage , uri -, hex , happy-eyeballs-mirage , happy-eyeballs , ca-certs-nss @@ -26,10 +25,7 @@ , lwt , mirage-clock , mirage-flow -, mirage-random , mirage-time -, result -, rresult , alcotest , alcotest-lwt , bigstringaf @@ -49,8 +45,6 @@ buildDunePackage { dns-client happy-eyeballs-mirage ipaddr - mirage-random - rresult ]; propagatedBuildInputs = [ @@ -64,7 +58,6 @@ buildDunePackage { tls tls-mirage uri - hex happy-eyeballs ca-certs-nss mirage-crypto @@ -78,7 +71,6 @@ buildDunePackage { mirage-clock mirage-flow mirage-time - result ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index 79b1a30d61fc..d51943a5cdc2 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -4,14 +4,13 @@ buildDunePackage rec { pname = "happy-eyeballs"; - version = "0.5.0"; + version = "1.1.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; - hash = "sha256-T4BOFlSj3xfUFhP9v8UaCHgmhvGrMyeqNUQf79bdBh4="; + hash = "sha256-zmZwueHs9be8M5x8Zm2rjPJb6bryDNTAeE8SEFtP3ME="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index 6d2ef3b80571..e7dc5b8705ef 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-lwt +, dns , duration , domain-name , ipaddr @@ -17,7 +17,6 @@ buildDunePackage { inherit (happy-eyeballs) src version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ cmdliner @@ -29,7 +28,7 @@ buildDunePackage { ]; propagatedBuildInputs = [ - dns-client-lwt + dns 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 bc3341a422f8..1ff66a371044 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -1,7 +1,6 @@ { buildDunePackage , happy-eyeballs , duration -, dns-client-mirage , domain-name , ipaddr , fmt @@ -32,7 +31,6 @@ buildDunePackage { ]; propagatedBuildInputs = [ - dns-client-mirage happy-eyeballs logs lwt diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index f6c9a59193e2..84b27dc69ff1 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -16,13 +16,13 @@ buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.5"; + version = "0.0.6"; minimalOCamlVersion = "4.08"; src = fetchurl { 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 = [ diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index eb910c5a5b04..706286fe26e6 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -1,22 +1,20 @@ { lib, buildDunePackage, fetchurl -, fmt, mirage-flow, cstruct, logs, ke, lwt +, mirage-flow, cstruct, logs, ke, lwt , alcotest, alcotest-lwt, bigstringaf }: buildDunePackage rec { pname = "mimic"; - version = "0.0.6"; + version = "0.0.9"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; - sha256 = "sha256-gVvBj4NqqKR2mn944g9F0bFZ8Me+WC87skti0dBW3Cg="; + hash = "sha256-lU3xzrVIqSKnhUQIhaXRamr39zXWw3DtNdM5EUtp4p8="; }; propagatedBuildInputs = [ - fmt lwt mirage-flow logs diff --git a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix index 569cc713fd1d..ede649c69516 100644 --- a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix +++ b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, mimic, happy-eyeballs-mirage }: +{ lib, buildDunePackage, dns-client-mirage, mimic, happy-eyeballs-mirage }: buildDunePackage { pname = "mimic-happy-eyeballs"; @@ -6,11 +6,9 @@ buildDunePackage { inherit (mimic) src version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - - strictDeps = true; propagatedBuildInputs = [ + dns-client-mirage mimic happy-eyeballs-mirage ]; diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index 6b454512915b..d95104c3c6b6 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -2,14 +2,13 @@ buildDunePackage rec { pname = "mirage-flow"; - version = "3.0.0"; + version = "4.0.2"; - duneVersion = "3"; minimalOCamlVersion = "4.05"; src = fetchurl { - url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; - hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; + url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-${version}.tbz"; + hash = "sha256-SGXj3S4b53O9JENUFuMl3I+QoiZ0QSrYu7zTet7q+1o="; }; propagatedBuildInputs = [ cstruct fmt lwt ]; diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix index 94b5f39820fa..95a1e585754e 100644 --- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix +++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix @@ -1,19 +1,18 @@ { lib, buildDunePackage, fetchurl , lwt, mirage-net -, cstruct, ipaddr, macaddr, mirage-profile +, cstruct, ipaddr, macaddr , duration, logs }: buildDunePackage rec { pname = "mirage-vnetif"; - version = "0.6.0"; + version = "0.6.2"; minimalOCamlVersion = "4.06"; - duneVersion = "3"; src = fetchurl { 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 = [ @@ -22,7 +21,6 @@ buildDunePackage rec { cstruct ipaddr macaddr - mirage-profile duration logs ]; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index e5f21b9ea3b2..a19f3797e71a 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -23,8 +23,6 @@ buildDunePackage { src ; - duneVersion = "3"; - propagatedBuildInputs = [ paf cohttp-lwt diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index e95d3b182a52..ca04e6bcfe37 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -23,11 +23,11 @@ buildDunePackage rec { pname = "paf"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - hash = "sha256-oWRvwb8DhtF3ltWaZ6moKmgadFUngruo1UOIaGNV/oM="; + hash = "sha256-uvNezux0V4mwbxU07zCfCYXOgCYKPxshOKiiAjLef9k="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index 7be8d9c21caf..a5c37a292930 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -1,6 +1,7 @@ { lib , buildDunePackage , fetchurl +, fetchpatch , mirage-crypto-rng , mtime , gluon @@ -21,6 +22,13 @@ buildDunePackage rec { 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 = [ gluon mirage-crypto-rng diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 1f86d7ef5bfb..45702c493fea 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -5,7 +5,7 @@ , macaddr, macaddr-cstruct, fmt , lwt, lwt-dllist, logs, duration, randomconv, ethernet , 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 , withFreestanding ? false , ocaml-freestanding @@ -13,11 +13,11 @@ buildDunePackage rec { pname = "tcpip"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-NrTBVr4WcCukxteBotqLoUYrIjcNFVcOERYFbL8CUjM="; + hash = "sha256-hrpdkvkHi93GUxL2O19M40/SVw12VDOyOiJquE11qcA="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ buildDunePackage rec { doCheck = true; checkInputs = [ alcotest - mirage-random-test + mirage-crypto-rng mirage-flow mirage-vnetif pcap-format diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 032b080bebd7..745712cbab52 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,16 +1,16 @@ { 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 -, alcotest, cstruct-unix, ounit2, randomconv +, alcotest, cstruct-unix, ounit2 }: buildDunePackage rec { pname = "tls"; - version = "0.17.3"; + version = "0.17.5"; src = fetchurl { 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"; @@ -25,7 +25,6 @@ buildDunePackage rec { mirage-crypto-ec mirage-crypto-pk mirage-crypto-rng - lwt ptime x509 ipaddr @@ -36,7 +35,6 @@ buildDunePackage rec { alcotest cstruct-unix ounit2 - randomconv ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix index a8add9e6ea6b..49d2967b27ee 100644 --- a/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/pkgs/development/ocaml-modules/tls/mirage.nix @@ -1,5 +1,5 @@ { 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 { @@ -11,7 +11,6 @@ buildDunePackage { lwt mirage-clock mirage-crypto - mirage-crypto-ec mirage-crypto-pk mirage-flow mirage-kv diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index e727c8667669..e1be60da8bd7 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -1,37 +1,31 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, ppx_sexp_conv, ounit +, ounit2 , lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport -, sexplib, cmdliner }: buildDunePackage rec { pname = "vchan"; - version = "6.0.1"; + version = "6.0.2"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; - hash = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; + hash = "sha256-fki12lrWuIweGX/vSD2gbMX9qaM4KthiDZLeJYWcX+U="; }; propagatedBuildInputs = [ - ppx_cstruct - ppx_sexp_conv lwt cstruct io-page mirage-flow xenstore xenstore_transport - sexplib ]; doCheck = true; checkInputs = [ - cmdliner - ounit + ounit2 ]; meta = with lib; {