From c63c55f052faf3324743295907888c68245be9da Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Oct 2023 11:47:33 +0200 Subject: chore(tvix): bump tokio[-util], tonic, prost This bumps all these dependencies to their more recent versions. We have to enable the `macros` tonic feature, and looks like we should also enable `rt`, not only `rt-multi-thread`. Change-Id: Icc3600848fca0bacce24f4889d088e75711594ef Reviewed-on: https://cl.tvl.fyi/c/depot/+/8984 Reviewed-by: Connor Brewster Tested-by: BuildkiteCI Autosubmit: flokli Reviewed-by: tazjin --- tvix/Cargo.lock | 89 +++++++++------------ tvix/Cargo.nix | 209 +++++++++++++++--------------------------------- tvix/castore/Cargo.toml | 14 ++-- tvix/store/Cargo.toml | 14 ++-- 4 files changed, 115 insertions(+), 211 deletions(-) (limited to 'tvix') diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 6e1e3c4a6f..47e91cc157 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -124,7 +124,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -135,7 +135,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -217,9 +217,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bit-set" @@ -404,7 +404,7 @@ dependencies = [ "heck", "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -846,7 +846,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1586,7 +1586,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1649,12 +1649,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" dependencies = [ "proc-macro2 1.0.67", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -1722,9 +1722,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", "prost-derive", @@ -1732,44 +1732,44 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck", "itertools", - "lazy_static", "log", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.109", + "syn 2.0.16", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", "itertools", "proc-macro2 1.0.67", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ "prost", ] @@ -2115,7 +2115,7 @@ checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2299,9 +2299,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", @@ -2429,7 +2429,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2519,7 +2519,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2535,9 +2535,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -2583,17 +2583,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", "axum", "base64", "bytes", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -2602,43 +2600,38 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] name = "tonic-build" -version = "0.8.4" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2 1.0.67", "prost-build", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "tonic-reflection" -version = "0.5.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0455f730d540a1484bffc3c55c94100b18a662597b982c2e9073f2c55c602616" +checksum = "3fa37c513df1339d197f4ba21d28c918b9ef1ac1768265f11ecb6b7f1cba1b76" dependencies = [ - "bytes", "prost", "prost-types", "tokio", "tokio-stream", "tonic", - "tonic-build", ] [[package]] @@ -2694,7 +2687,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2 1.0.67", "quote 1.0.26", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2707,16 +2700,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 2c47ef9bfc..f1c28ae81c 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -425,7 +425,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; features = [ "full" "visit-mut" ]; } ]; @@ -451,7 +451,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; features = [ "full" "visit-mut" ]; } ]; @@ -747,9 +747,9 @@ rec { }; "base64" = rec { crateName = "base64"; - version = "0.13.1"; + version = "0.21.4"; edition = "2018"; - sha256 = "1s494mqmzjb766fy1kqlccgfg2sdcjb6hzbvzqv2jw65fdi5h6wy"; + sha256 = "18jhmsli1l7zn6pgslgjdrnghqnz12g68n25fv48ids3yfk3x94v"; authors = [ "Alice Maz " "Marshall Pierce " @@ -1267,7 +1267,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; features = [ "full" ]; } ]; @@ -2449,7 +2449,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; features = [ "full" ]; } ]; @@ -4604,7 +4604,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; features = [ "full" "visit-mut" ]; } ]; @@ -4764,9 +4764,9 @@ rec { }; "prettyplease" = rec { crateName = "prettyplease"; - version = "0.1.25"; + version = "0.2.9"; edition = "2021"; - sha256 = "11lskniv8pf8y8bn4dc3nmjapfhnibxbm5gamp2ad9qna3lld1kc"; + sha256 = "10n2s6b11pmh8qxz9kjmrb6pgnv5dnsydi3rxpz221nn053a09cq"; authors = [ "David Tolnay " ]; @@ -4778,7 +4778,7 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.16"; usesDefaultFeatures = false; features = [ "full" ]; } @@ -4786,7 +4786,7 @@ rec { devDependencies = [ { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.16"; usesDefaultFeatures = false; features = [ "parsing" ]; } @@ -4996,9 +4996,9 @@ rec { }; "prost" = rec { crateName = "prost"; - version = "0.11.9"; + version = "0.12.1"; edition = "2021"; - sha256 = "1kc1hva2h894hc0zf6r4r8fsxfpazf7xn5rj3jya9sbrsyhym0hb"; + sha256 = "039lgs7qbc8mvn2bk8hm84nhczqw79hs1x0d0qybaccw7cpx5zgl"; authors = [ "Dan Burkert " "Lucio Franco " "Lucio Franco " @@ -5048,10 +5048,6 @@ rec { usesDefaultFeatures = false; features = [ "use_alloc" ]; } - { - name = "lazy_static"; - packageId = "lazy_static"; - } { name = "log"; packageId = "log"; @@ -5061,6 +5057,10 @@ rec { packageId = "multimap"; usesDefaultFeatures = false; } + { + name = "once_cell"; + packageId = "once_cell"; + } { name = "petgraph"; packageId = "petgraph"; @@ -5089,7 +5089,7 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.16"; optional = true; features = [ "full" ]; } @@ -5115,9 +5115,9 @@ rec { }; "prost-derive" = rec { crateName = "prost-derive"; - version = "0.11.9"; + version = "0.12.1"; edition = "2021"; - sha256 = "1d3mw2s2jba1f7wcjmjd6ha2a255p2rmynxhm1nysv9w1z8xilp5"; + sha256 = "0cjcib5w99sycw01j4a1j1xcx97crg9gfyc10zsnqhdxzaksnnr6"; procMacro = true; authors = [ "Dan Burkert " @@ -5145,7 +5145,7 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.16"; features = [ "extra-traits" ]; } ]; @@ -5153,9 +5153,9 @@ rec { }; "prost-types" = rec { crateName = "prost-types"; - version = "0.11.9"; + version = "0.12.1"; edition = "2021"; - sha256 = "04ryk38sqkp2nf4dgdqdfbgn6zwwvjraw6hqq6d9a6088shj4di1"; + sha256 = "1kr7ffva3sfc0ya0qkwa5pwnq5gr4kj3z7zwbk3lnfnqcfgv50g0"; authors = [ "Dan Burkert " "Lucio Franco " ]; @@ -7018,7 +7018,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; } ]; @@ -7328,7 +7328,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; features = [ "full" ]; } ]; @@ -7379,9 +7379,9 @@ rec { }; "tokio-util" = rec { crateName = "tokio-util"; - version = "0.7.8"; + version = "0.7.9"; edition = "2021"; - sha256 = "0zfvblvskaj65rianw6agz9hnbdbsfgf5fkw4srwik3yr31fhvw0"; + sha256 = "03d63ivnd8pwi6qzrlw0gyqkiawq5vmkb5sdb4hhnypm4130fs0x"; authors = [ "Tokio Contributors " ]; @@ -7548,9 +7548,9 @@ rec { }; "tonic" = rec { crateName = "tonic"; - version = "0.8.3"; - edition = "2018"; - sha256 = "1yymp2xi1p60g81p5jfaybcawpfkb01vqvzqn4cyz6wj7fnry8cg"; + version = "0.10.2"; + edition = "2021"; + sha256 = "03hx1b2810p4jmsphbql8cn3r22c9n1ar73bj8azf7761lx96q6m"; authors = [ "Lucio Franco " ]; @@ -7558,6 +7558,7 @@ rec { { name = "async-stream"; packageId = "async-stream"; + optional = true; } { name = "async-trait"; @@ -7578,16 +7579,6 @@ rec { name = "bytes"; packageId = "bytes"; } - { - name = "futures-core"; - packageId = "futures-core"; - usesDefaultFeatures = false; - } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } { name = "h2"; packageId = "h2"; @@ -7623,29 +7614,18 @@ rec { { name = "prost"; packageId = "prost"; - rename = "prost1"; - optional = true; - } - { - name = "prost-derive"; - packageId = "prost-derive"; optional = true; + usesDefaultFeatures = false; + features = [ "std" ]; } { name = "tokio"; packageId = "tokio"; - optional = true; - features = [ "net" ]; } { name = "tokio-stream"; packageId = "tokio-stream"; } - { - name = "tokio-util"; - packageId = "tokio-util"; - features = [ "codec" ]; - } { name = "tower"; packageId = "tower"; @@ -7665,11 +7645,6 @@ rec { name = "tracing"; packageId = "tracing"; } - { - name = "tracing-futures"; - packageId = "tracing-futures"; - optional = true; - } ]; devDependencies = [ { @@ -7684,39 +7659,23 @@ rec { } ]; features = { - "async-trait" = [ "dep:async-trait" ]; - "axum" = [ "dep:axum" ]; - "channel" = [ "h2" "hyper" "tokio" "tower" "tracing-futures" "tokio/macros" "tokio/time" "hyper-timeout" ]; - "codegen" = [ "async-trait" ]; + "codegen" = [ "dep:async-trait" ]; "default" = [ "transport" "codegen" "prost" ]; - "flate2" = [ "dep:flate2" ]; - "gzip" = [ "flate2" ]; - "h2" = [ "dep:h2" ]; - "hyper" = [ "dep:hyper" ]; - "hyper-timeout" = [ "dep:hyper-timeout" ]; - "prost" = [ "prost1" "prost-derive" ]; - "prost-derive" = [ "dep:prost-derive" ]; - "prost1" = [ "dep:prost1" ]; - "rustls-native-certs" = [ "dep:rustls-native-certs" ]; - "rustls-pemfile" = [ "dep:rustls-pemfile" ]; - "tls" = [ "rustls-pemfile" "transport" "tokio-rustls" ]; - "tls-roots" = [ "tls-roots-common" "rustls-native-certs" ]; + "gzip" = [ "dep:flate2" ]; + "prost" = [ "dep:prost" ]; + "tls" = [ "dep:rustls-pemfile" "transport" "dep:tokio-rustls" "dep:rustls" "tokio/rt" "tokio/macros" ]; + "tls-roots" = [ "tls-roots-common" "dep:rustls-native-certs" ]; "tls-roots-common" = [ "tls" ]; - "tls-webpki-roots" = [ "tls-roots-common" "webpki-roots" ]; - "tokio" = [ "dep:tokio" ]; - "tokio-rustls" = [ "dep:tokio-rustls" ]; - "tower" = [ "dep:tower" ]; - "tracing-futures" = [ "dep:tracing-futures" ]; - "transport" = [ "axum" "channel" ]; - "webpki-roots" = [ "dep:webpki-roots" ]; + "tls-webpki-roots" = [ "tls-roots-common" "dep:webpki-roots" ]; + "transport" = [ "dep:async-stream" "dep:axum" "channel" "dep:h2" "dep:hyper" "tokio/net" "tokio/time" "dep:tower" "dep:hyper-timeout" ]; }; - resolvedDefaultFeatures = [ "async-trait" "axum" "channel" "codegen" "default" "h2" "hyper" "hyper-timeout" "prost" "prost-derive" "prost1" "tokio" "tower" "tracing-futures" "transport" ]; + resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "transport" ]; }; "tonic-build" = rec { crateName = "tonic-build"; - version = "0.8.4"; - edition = "2018"; - sha256 = "1i781mfzcbzfk6fnf7qp95q6r0b05ixvmynw4z0agq7pq2wykxav"; + version = "0.10.2"; + edition = "2021"; + sha256 = "129qd12ka65h5f1dzi5mrlz6wndi0pfx1320lawq51f18k01y0lx"; authors = [ "Lucio Franco " ]; @@ -7740,11 +7699,11 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.16"; } ]; features = { - "cleanup-markdown" = [ "prost-build/cleanup-markdown" ]; + "cleanup-markdown" = [ "prost" "prost-build/cleanup-markdown" ]; "default" = [ "transport" "prost" ]; "prost" = [ "prost-build" ]; "prost-build" = [ "dep:prost-build" ]; @@ -7753,18 +7712,14 @@ rec { }; "tonic-reflection" = rec { crateName = "tonic-reflection"; - version = "0.5.0"; - edition = "2018"; - sha256 = "05i6c1fcbwkkj0p2r63vb5iac60b22a5rif3zx5li8a0slqgfm84"; + version = "0.10.2"; + edition = "2021"; + sha256 = "0xhvp8f7ysyb3vqnb0knq4dfzf8qr4l1v8jbgwcrsczi7m8pr8rz"; authors = [ "James Nugent " "Samani G. Gikandi " ]; dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - } { name = "prost"; packageId = "prost"; @@ -7776,7 +7731,7 @@ rec { { name = "tokio"; packageId = "tokio"; - features = [ "sync" ]; + features = [ "sync" "rt" ]; } { name = "tokio-stream"; @@ -7786,14 +7741,16 @@ rec { { name = "tonic"; packageId = "tonic"; + usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } ]; - buildDependencies = [ + devDependencies = [ { - name = "tonic-build"; - packageId = "tonic-build"; - features = [ "transport" "prost" ]; + name = "tonic"; + packageId = "tonic"; + usesDefaultFeatures = false; + features = [ "transport" ]; } ]; @@ -8012,7 +7969,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.15"; + packageId = "syn 2.0.16"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -8049,42 +8006,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "once_cell" "std" "valuable" ]; }; - "tracing-futures" = rec { - crateName = "tracing-futures"; - version = "0.2.5"; - edition = "2018"; - sha256 = "1wimg0iwa2ldq7xv98lvivvf3q9ykfminig8r1bs0ig22np9bl4p"; - authors = [ - "Eliza Weisman " - "Tokio Contributors " - ]; - dependencies = [ - { - name = "pin-project"; - packageId = "pin-project"; - optional = true; - } - { - name = "tracing"; - packageId = "tracing"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "std-future" "std" ]; - "futures" = [ "dep:futures" ]; - "futures-01" = [ "futures_01" "std" ]; - "futures-03" = [ "std-future" "futures" "futures-task" "std" ]; - "futures-task" = [ "dep:futures-task" ]; - "futures_01" = [ "dep:futures_01" ]; - "pin-project" = [ "dep:pin-project" ]; - "std" = [ "tracing/std" ]; - "std-future" = [ "pin-project" ]; - "tokio" = [ "dep:tokio" ]; - "tokio-executor" = [ "dep:tokio-executor" ]; - }; - resolvedDefaultFeatures = [ "default" "pin-project" "std" "std-future" ]; - }; "tracing-log" = rec { crateName = "tracing-log"; version = "0.1.3"; @@ -8301,7 +8222,7 @@ rec { { name = "tokio"; packageId = "tokio"; - features = [ "fs" "net" "rt-multi-thread" "signal" ]; + features = [ "fs" "macros" "net" "rt" "rt-multi-thread" "signal" ]; } { name = "tokio-stream"; @@ -8729,7 +8650,7 @@ rec { { name = "tokio"; packageId = "tokio"; - features = [ "fs" "net" "rt-multi-thread" "signal" ]; + features = [ "fs" "macros" "net" "rt" "rt-multi-thread" "signal" ]; } { name = "tokio-listener"; diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index 48366539ce..8f96c3fbf6 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -11,13 +11,13 @@ data-encoding = "2.3.3" futures = "0.3.28" lazy_static = "1.4.0" pin-project-lite = "0.2.13" -prost = "0.11.2" +prost = "0.12.1" sled = { version = "0.34.7", features = ["compression"] } thiserror = "1.0.38" tokio-stream = { version = "0.1.14", features = ["fs", "net"] } -tokio-util = { version = "0.7.8", features = ["io", "io-util"] } -tokio = { version = "1.28.0", features = ["fs", "net", "rt-multi-thread", "signal"] } -tonic = "0.8.2" +tokio-util = { version = "0.7.9", features = ["io", "io-util"] } +tokio = { version = "1.32.0", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } +tonic = "0.10.2" tower = "0.4.13" tracing = "0.1.37" url = "2.4.0" @@ -25,11 +25,11 @@ walkdir = "2.4.0" [dependencies.tonic-reflection] optional = true -version = "0.5.0" +version = "0.10.2" [build-dependencies] -prost-build = "0.11.2" -tonic-build = "0.8.2" +prost-build = "0.12.1" +tonic-build = "0.10.2" [dev-dependencies] test-case = "2.2.2" diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 2b2a981596..e4ebfc9a0f 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -16,14 +16,14 @@ lazy_static = "1.4.0" nix-compat = { path = "../nix-compat" } parking_lot = "0.12.1" pin-project-lite = "0.2.13" -prost = "0.11.2" +prost = "0.12.1" sha2 = "0.10.6" sled = { version = "0.34.7", features = ["compression"] } thiserror = "1.0.38" tokio-stream = { version = "0.1.14", features = ["fs"] } -tokio-util = { version = "0.7.8", features = ["io", "io-util"] } -tokio = { version = "1.28.0", features = ["fs", "net", "rt-multi-thread", "signal"] } -tonic = "0.8.2" +tokio-util = { version = "0.7.9", features = ["io", "io-util"] } +tokio = { version = "1.32.0", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } +tonic = "0.10.2" tower = "0.4.13" tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", features = ["json"] } @@ -64,15 +64,15 @@ version = "0.2.1" [dependencies.tonic-reflection] optional = true -version = "0.5.0" +version = "0.10.2" [dependencies.libc] optional = true version = "0.2.144" [build-dependencies] -prost-build = "0.11.2" -tonic-build = "0.8.2" +prost-build = "0.12.1" +tonic-build = "0.10.2" [dev-dependencies] test-case = "2.2.2" -- cgit 1.4.1