From 625b3f5b7d6d448b84e59182f6dfaa67b9cd577e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Mar 2025 06:49:24 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.awa:=200.4.0=20=E2=86=92=200.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.ca-certs-nss: 3.108 → 3.108-1 ocamlPackages.conduit: 7.1.0 → 8.0.0 ocamlPackages.dns: 9.1.0 → 10.0.0 ocamlPackages.git: 3.17.0 → 3.18.0 ocamlPackages.happy-eyeballs: 1.2.2 → 2.0.0 ocamlPackages.http-mirage-client: 0.0.8 → 0.0.10 ocamlPackages.letsencrypt: 1.0.0 → 1.1.0 ocamlPackages.paf: 0.7.0 → 0.8.0 --- pkgs/development/ocaml-modules/awa/default.nix | 4 ++-- pkgs/development/ocaml-modules/awa/mirage.nix | 8 ++++---- .../ocaml-modules/ca-certs-nss/default.nix | 8 ++++---- .../ocaml-modules/conduit/default.nix | 4 ++-- .../development/ocaml-modules/conduit/mirage.nix | 12 ++++++------ pkgs/development/ocaml-modules/dns/certify.nix | 12 ++++++------ .../development/ocaml-modules/dns/client-lwt.nix | 4 ++-- .../ocaml-modules/dns/client-mirage.nix | 16 ++++++++-------- pkgs/development/ocaml-modules/dns/default.nix | 4 ++-- pkgs/development/ocaml-modules/dns/mirage.nix | 2 ++ pkgs/development/ocaml-modules/dns/resolver.nix | 14 ++++++++------ pkgs/development/ocaml-modules/dns/server.nix | 10 ++++++---- pkgs/development/ocaml-modules/dns/stub.nix | 10 ++++------ pkgs/development/ocaml-modules/git/default.nix | 6 ++---- pkgs/development/ocaml-modules/git/mirage.nix | 12 ++++-------- pkgs/development/ocaml-modules/git/paf.nix | 8 ++------ pkgs/development/ocaml-modules/git/unix.nix | 6 ------ .../ocaml-modules/happy-eyeballs/default.nix | 4 ++-- .../ocaml-modules/happy-eyeballs/mirage.nix | 11 ++++------- .../ocaml-modules/http-mirage-client/default.nix | 14 ++++---------- .../ocaml-modules/letsencrypt/default.nix | 4 ++-- pkgs/development/ocaml-modules/paf/cohttp.nix | 6 ++---- pkgs/development/ocaml-modules/paf/default.nix | 12 ++++-------- 23 files changed, 82 insertions(+), 109 deletions(-) diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 41e17d575c57..78f31a36e283 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -20,13 +20,13 @@ buildDunePackage rec { pname = "awa"; - version = "0.4.0"; + version = "0.5.0"; minimalOCamlVersion = "4.10"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-uATKGr+J18jBx5vErB93Q9+BCR7ezi1Q+ueQGolpybQ="; + hash = "sha256-SYSkhB43KmYaCEYGwFihMPLvh1Zr9xeWFio5atY19A8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix index 795f421e1c17..6189d4118032 100644 --- a/pkgs/development/ocaml-modules/awa/mirage.nix +++ b/pkgs/development/ocaml-modules/awa/mirage.nix @@ -5,10 +5,10 @@ mtime, lwt, mirage-flow, - mirage-clock, + mirage-sleep, logs, duration, - mirage-time, + mirage-mtime, }: buildDunePackage { @@ -22,10 +22,10 @@ buildDunePackage { mtime lwt mirage-flow - mirage-clock + mirage-sleep logs duration - mirage-time + mirage-mtime ]; inherit (awa) meta; diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index d5532cd2cacc..f23d3bd67ccd 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -3,7 +3,7 @@ buildDunePackage, fetchurl, digestif, - mirage-clock, + mirage-ptime, x509, logs, fmt, @@ -14,17 +14,17 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.108"; + version = "3.108-1"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-mRHj0vnWDPyCxya3K1qxREkF7eVac8LRY6gOJJdzFTM="; + hash = "sha256-soYi8sW1OrfznijCGYgFWY6gayguQs3/FcBXlC2FflY="; }; propagatedBuildInputs = [ - mirage-clock + mirage-ptime x509 digestif ]; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 333dcfaa7226..d131b7cb5754 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -12,13 +12,13 @@ buildDunePackage rec { pname = "conduit"; - version = "7.1.0"; + version = "8.0.0"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - hash = "sha256-WNIhigfnFwYCXeOMoCUyM+lw81tMrNN/cGlBtMvqV/c="; + hash = "sha256-CmPZEIZbVHOJOhcM2lH2E4j0iOz0xLLtf+nsTiz2b2E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 41da2c2d8c27..25da0573a08c 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -7,9 +7,9 @@ cstruct, mirage-flow, mirage-flow-combinators, - mirage-crypto-rng-mirage, - mirage-time, - mirage-clock, + mirage-crypto-rng, + mirage-ptime, + mirage-mtime, dns-client-mirage, vchan, xenstore, @@ -32,11 +32,11 @@ buildDunePackage { sexplib0 uri cstruct - mirage-clock + mirage-ptime + mirage-mtime mirage-flow mirage-flow-combinators - mirage-crypto-rng-mirage - mirage-time + mirage-crypto-rng dns-client-mirage conduit-lwt vchan diff --git a/pkgs/development/ocaml-modules/dns/certify.nix b/pkgs/development/ocaml-modules/dns/certify.nix index d289f8bc57b1..609030c93fe0 100644 --- a/pkgs/development/ocaml-modules/dns/certify.nix +++ b/pkgs/development/ocaml-modules/dns/certify.nix @@ -5,11 +5,11 @@ dns-mirage, randomconv, x509, - mirage-time, - mirage-clock, + mirage-sleep, + mirage-ptime, logs, mirage-crypto-pk, - mirage-crypto-rng-mirage, + mirage-crypto-rng, mirage-crypto-ec, lwt, tcpip, @@ -26,11 +26,11 @@ buildDunePackage { dns-mirage randomconv x509 - mirage-time - mirage-clock + mirage-sleep + mirage-ptime logs mirage-crypto-pk - mirage-crypto-rng-mirage + mirage-crypto-rng mirage-crypto-ec lwt tcpip diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix index 0daa7a6299d7..cb6c0c2abc10 100644 --- a/pkgs/development/ocaml-modules/dns/client-lwt.nix +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -3,7 +3,7 @@ dns, dns-client, lwt, - mirage-crypto-rng-lwt, + mirage-crypto-rng, mtime, ipaddr, alcotest, @@ -27,7 +27,7 @@ buildDunePackage { happy-eyeballs-lwt tls-lwt mtime - mirage-crypto-rng-lwt + mirage-crypto-rng ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix index 77e999e5e713..6dc4920c0350 100644 --- a/pkgs/development/ocaml-modules/dns/client-mirage.nix +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -3,16 +3,16 @@ dns, dns-client, lwt, - mirage-clock, - mirage-time, - mirage-crypto-rng-mirage, + mirage-sleep, + mirage-mtime, + mirage-ptime, + mirage-crypto-rng, domain-name, ipaddr, ca-certs-nss, happy-eyeballs, happy-eyeballs-mirage, tcpip, - tls, tls-mirage, }: @@ -25,14 +25,14 @@ buildDunePackage { domain-name ipaddr lwt - mirage-crypto-rng-mirage - mirage-time - mirage-clock + mirage-crypto-rng + mirage-sleep + mirage-mtime + mirage-ptime ca-certs-nss happy-eyeballs happy-eyeballs-mirage tcpip - tls tls-mirage ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 3d6fb07fb35b..ed889526432b 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -18,13 +18,13 @@ buildDunePackage rec { pname = "dns"; - version = "9.1.0"; + version = "10.0.0"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - hash = "sha256-jz7JWs8U9XQhm1RAponq4azCpJyx2KBm+bI6esaPRPA="; + hash = "sha256-dPO9BjvTE0UrpxKrmtgPrgfV/2uG/E9Wd/BNYSMtFwI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/dns/mirage.nix b/pkgs/development/ocaml-modules/dns/mirage.nix index fddf48ad7399..87393d15c55f 100644 --- a/pkgs/development/ocaml-modules/dns/mirage.nix +++ b/pkgs/development/ocaml-modules/dns/mirage.nix @@ -1,6 +1,7 @@ { buildDunePackage, dns, + cstruct, ipaddr, lwt, tcpip, @@ -12,6 +13,7 @@ buildDunePackage { inherit (dns) version src; propagatedBuildInputs = [ + cstruct dns ipaddr lwt diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index c647aa49aa47..04daff6b5b34 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -7,9 +7,10 @@ duration, randomconv, lwt, - mirage-time, - mirage-clock, - mirage-random, + mirage-sleep, + mirage-mtime, + mirage-ptime, + mirage-crypto-rng, tcpip, tls, tls-mirage, @@ -32,9 +33,10 @@ buildDunePackage { duration randomconv lwt - mirage-time - mirage-clock - mirage-random + mirage-sleep + mirage-mtime + mirage-ptime + mirage-crypto-rng tcpip tls tls-mirage diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix index 3fcbda761bd4..772e165a3881 100644 --- a/pkgs/development/ocaml-modules/dns/server.nix +++ b/pkgs/development/ocaml-modules/dns/server.nix @@ -5,8 +5,9 @@ randomconv, duration, lwt, - mirage-time, - mirage-clock, + mirage-sleep, + mirage-mtime, + mirage-ptime, metrics, alcotest, mirage-crypto-rng, @@ -25,8 +26,9 @@ buildDunePackage { randomconv duration lwt - mirage-time - mirage-clock + mirage-sleep + mirage-mtime + mirage-ptime metrics ]; diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix index f98b79a11bc2..1ff852045e3b 100644 --- a/pkgs/development/ocaml-modules/dns/stub.nix +++ b/pkgs/development/ocaml-modules/dns/stub.nix @@ -9,9 +9,8 @@ duration, randomconv, lwt, - mirage-time, - mirage-clock, - mirage-crypto-rng-mirage, + mirage-ptime, + mirage-crypto-rng, tcpip, metrics, }: @@ -31,9 +30,8 @@ buildDunePackage { duration randomconv lwt - mirage-time - mirage-clock - mirage-crypto-rng-mirage + mirage-ptime + mirage-crypto-rng tcpip metrics ]; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 71fc943fadec..16580b8208bf 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,7 +8,6 @@ git-binary, angstrom, astring, - cstruct, decompress, digestif, encore, @@ -40,13 +39,13 @@ buildDunePackage rec { pname = "git"; - version = "3.17.0"; + version = "3.18.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - hash = "sha256-7yANBBLtGlOFJdBQEpiJDguJPgIFKAlNajrhI1n9AmU="; + hash = "sha256-kleVYn5tquC0vRaqUGh53xHLIB5l/v446BN48Y1RfUs="; }; buildInputs = [ @@ -56,7 +55,6 @@ buildDunePackage rec { angstrom astring checkseum - cstruct decompress digestif encore diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix index 82225157ccdf..cc897e69542f 100644 --- a/pkgs/development/ocaml-modules/git/mirage.nix +++ b/pkgs/development/ocaml-modules/git/mirage.nix @@ -7,8 +7,6 @@ git-paf, awa, awa-mirage, - dns, - dns-client, tls, tls-mirage, uri, @@ -24,9 +22,9 @@ fmt, ipaddr, lwt, - mirage-clock, mirage-flow, - mirage-time, + mirage-ptime, + mirage-sleep, alcotest, alcotest-lwt, bigstringaf, @@ -42,8 +40,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; buildInputs = [ - dns - dns-client happy-eyeballs-mirage ipaddr ]; @@ -69,9 +65,9 @@ buildDunePackage { domain-name fmt lwt - mirage-clock + mirage-ptime mirage-flow - mirage-time + mirage-sleep ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 9b4fdac9ea0b..55ab06726049 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -8,14 +8,12 @@ ipaddr, logs, lwt, - mirage-clock, - mirage-time, rresult, tls, uri, bigstringaf, domain-name, - httpaf, + h1, mirage-flow, tls-mirage, }: @@ -37,13 +35,11 @@ buildDunePackage { rresult ipaddr logs - mirage-clock - mirage-time tls uri bigstringaf domain-name - httpaf + h1 mirage-flow tls-mirage ]; diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index ca4f784490c3..371018a41fea 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -10,8 +10,6 @@ digestif, logs, lwt, - mirage-clock, - mirage-clock-unix, astring, cmdliner, decompress, @@ -20,7 +18,6 @@ mtime, tcpip, mirage-flow, - mirage-unix, alcotest, alcotest-lwt, base64, @@ -43,7 +40,6 @@ buildDunePackage { buildInputs = [ cmdliner - mirage-clock tcpip ]; propagatedBuildInputs = [ @@ -60,14 +56,12 @@ buildDunePackage { domain-name ipaddr mirage-flow - mirage-unix cstruct mimic tls git happy-eyeballs-lwt git-mirage - mirage-clock-unix ]; checkInputs = [ alcotest diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index ea092ac66afd..a5532fe4903f 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -11,13 +11,13 @@ buildDunePackage rec { pname = "happy-eyeballs"; - version = "1.2.2"; + version = "2.0.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; - hash = "sha256-Cl0CZwQMwrmwMaidfqp8PyG57rYV2VOUVVW9ECVlLq8="; + hash = "sha256-pNATXIfb6yFNZ1gx6cTZikcYu2HDuG6Uqm+IT4D9nQ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index e0154c21ebcb..49b6e7a86707 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -7,9 +7,8 @@ fmt, logs, lwt, - mirage-clock, - mirage-random, - mirage-time, + mirage-mtime, + mirage-sleep, tcpip, }: @@ -19,16 +18,14 @@ buildDunePackage { inherit (happy-eyeballs) src version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ duration ipaddr domain-name fmt - mirage-clock - mirage-random - mirage-time + mirage-mtime + mirage-sleep ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 86450b2311a0..58f9852e8c86 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -3,34 +3,30 @@ fetchurl, buildDunePackage, h2, - httpaf, + h1, mimic-happy-eyeballs, - mirage-clock, paf, tcpip, x509, alcotest-lwt, - mirage-clock-unix, mirage-crypto-rng, - mirage-time-unix, }: buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.8"; + version = "0.0.10"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; - hash = "sha256-/1eguh2dYLDVNW+XWNKcwm5IgQWfEFUuQRYS205Ox+c="; + hash = "sha256-AXEIH1TIAayD4LkFv0yGD8OYvcdC/AJnGudGlkjcWLY="; }; propagatedBuildInputs = [ h2 - httpaf + h1 mimic-happy-eyeballs - mirage-clock paf tcpip x509 @@ -39,9 +35,7 @@ buildDunePackage rec { doCheck = true; checkInputs = [ alcotest-lwt - mirage-clock-unix mirage-crypto-rng - mirage-time-unix ]; meta = { diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 033ffde04a3a..dd61aa9373ff 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -20,11 +20,11 @@ buildDunePackage rec { pname = "letsencrypt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; - hash = "sha256-koNG19aoLY28Hb7GyuPuJUyrCAE59n2vjbH4z0ykGvA="; + hash = "sha256-Iw55GffyG5tWA49hao1z9BX6p4N2+EKuhLIoOwG8EKM="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index 253b271e0e97..53fcce10f584 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -3,13 +3,12 @@ paf, cohttp-lwt, domain-name, - httpaf, + h1, ipaddr, alcotest-lwt, fmt, logs, mirage-crypto-rng, - mirage-time-unix, tcpip, uri, lwt, @@ -28,7 +27,7 @@ buildDunePackage { paf cohttp-lwt domain-name - httpaf + h1 ipaddr ]; @@ -38,7 +37,6 @@ buildDunePackage { fmt logs mirage-crypto-rng - mirage-time-unix tcpip uri lwt diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 404597974164..47601a60b3c1 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -2,7 +2,7 @@ buildDunePackage, lib, fetchurl, - mirage-time, + h1, h2, tls-mirage, mimic, @@ -15,27 +15,25 @@ fmt, mirage-crypto-rng, tcpip, - mirage-time-unix, ptime, uri, alcotest-lwt, cstruct, - httpaf, }: buildDunePackage rec { pname = "paf"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - hash = "sha256-w2lGs+DYY08BUKumWFxPFTLQKvdRPu7H1FdQOIjDQyE="; + hash = "sha256-0q07gZpzUyDoWlA4m/P+EGSvvVKAZ7RwVkpOziqzG2M="; }; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ - mirage-time + h1 h2 tls-mirage mimic @@ -45,7 +43,6 @@ buildDunePackage rec { tls cstruct tcpip - httpaf ]; doCheck = true; @@ -54,7 +51,6 @@ buildDunePackage rec { logs fmt mirage-crypto-rng - mirage-time-unix ptime uri alcotest-lwt