From dbf87f3057ea8468f7bedf8cc61203131fce1f9b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 Mar 2024 22:53:43 +0200 Subject: chore(tvix): bump tonic to 0.11.0 This bumps tonic and surrounding crates to 0.11.x. We added support for tonic 0.11.x into tokio-listener (https://github.com/vi/tokio-listener/pull/4), so that's bumped as well. Change-Id: Icfade5894403228299836fefb21b2f9ae59dbebb Reviewed-on: https://cl.tvl.fyi/c/depot/+/11156 Reviewed-by: Connor Brewster Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/Cargo.lock | 315 ++++++++++++--- tvix/Cargo.nix | 1009 +++++++++++++++++++++++++++++++++++++++++------ tvix/build/Cargo.toml | 8 +- tvix/castore/Cargo.toml | 6 +- tvix/crate-hashes.json | 2 +- tvix/store/Cargo.toml | 8 +- 6 files changed, 1166 insertions(+), 182 deletions(-) diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index a10b4b35fa4d..a10dabdc0ee0 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -201,13 +201,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -222,6 +222,40 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -231,12 +265,33 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1115,7 +1170,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", "indexmap 2.1.0", "slab", "tokio", @@ -1179,6 +1253,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -1186,7 +1271,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1218,9 +1326,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1232,6 +1340,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.3", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1239,11 +1367,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", - "rustls", + "http 0.2.11", + "hyper 0.14.28", + "rustls 0.21.10", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -1252,12 +1380,28 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1798,7 +1942,7 @@ dependencies = [ "chrono", "futures", "humantime", - "hyper", + "hyper 0.14.28", "itertools 0.12.0", "md-5", "parking_lot 0.12.1", @@ -1859,7 +2003,7 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.11", "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -2426,10 +2570,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", @@ -2438,15 +2582,15 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-native-certs", + "rustls 0.21.10", + "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -2564,10 +2708,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -2580,6 +2738,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -2615,6 +2786,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -2756,6 +2938,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_spanned" version = "0.6.5" @@ -3199,18 +3391,20 @@ dependencies = [ [[package]] name = "tokio-listener" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "669ed78565b6ce6482aaf8c1f67e0ae1fa1cf1a97c090e96994d502857675d45" +checksum = "96367e127b4cf47b92592a5154a563435fe28fe3fccf25917d4a34ee59c87303" dependencies = [ + "axum 0.7.4", "document-features", "futures-core", - "hyper", + "futures-util", "nix 0.26.4", "pin-project", "socket2", "tokio", - "tonic 0.10.2", + "tokio-util", + "tonic 0.11.0", "tracing", ] @@ -3242,7 +3436,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.2", + "rustls-pki-types", "tokio", ] @@ -3341,15 +3546,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "base64", "bytes", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -3364,28 +3569,28 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", "prost 0.12.3", - "rustls", - "rustls-native-certs", - "rustls-pemfile 1.0.4", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.0", + "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-stream", "tower", "tower-layer", @@ -3395,9 +3600,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease", "proc-macro2 1.0.76", @@ -3408,15 +3613,15 @@ dependencies = [ [[package]] name = "tonic-reflection" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa37c513df1339d197f4ba21d28c918b9ef1ac1768265f11ecb6b7f1cba1b76" +checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" dependencies = [ "prost 0.12.3", "prost-types", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic 0.11.0", ] [[package]] @@ -3559,7 +3764,7 @@ dependencies = [ "thiserror", "tokio", "tokio-listener", - "tonic 0.10.2", + "tonic 0.11.0", "tonic-build", "tonic-reflection", "tracing", @@ -3598,7 +3803,7 @@ dependencies = [ "tokio-retry", "tokio-stream", "tokio-util", - "tonic 0.10.2", + "tonic 0.11.0", "tonic-build", "tonic-reflection", "tower", @@ -3764,7 +3969,7 @@ dependencies = [ "tokio-retry", "tokio-stream", "tokio-util", - "tonic 0.10.2", + "tonic 0.11.0", "tonic-build", "tonic-reflection", "tower", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 258461ffe427..87f9bbac7090 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -629,7 +629,7 @@ rec { ]; }; - "axum" = rec { + "axum 0.6.20" = rec { crateName = "axum"; version = "0.6.20"; edition = "2021"; @@ -641,7 +641,7 @@ rec { } { name = "axum-core"; - packageId = "axum-core"; + packageId = "axum-core 0.3.4"; } { name = "bitflags"; @@ -659,15 +659,15 @@ rec { } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "http-body"; - packageId = "http-body"; + packageId = "http-body 0.4.6"; } { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; features = [ "stream" ]; } { @@ -757,7 +757,184 @@ rec { "ws" = [ "tokio" "dep:tokio-tungstenite" "dep:sha1" "dep:base64" ]; }; }; - "axum-core" = rec { + "axum 0.7.4" = rec { + crateName = "axum"; + version = "0.7.4"; + edition = "2021"; + sha256 = "17kv7v8m981cqmfbv5m538fzxhw51l9bajv06kfddi7njarb8dhj"; + dependencies = [ + { + name = "async-trait"; + packageId = "async-trait"; + } + { + name = "axum-core"; + packageId = "axum-core 0.4.3"; + } + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "http-body"; + packageId = "http-body 1.0.0"; + } + { + name = "http-body-util"; + packageId = "http-body-util"; + } + { + name = "hyper"; + packageId = "hyper 1.2.0"; + optional = true; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + optional = true; + features = [ "tokio" "server" "server-auto" ]; + } + { + name = "itoa"; + packageId = "itoa"; + } + { + name = "matchit"; + packageId = "matchit"; + } + { + name = "memchr"; + packageId = "memchr"; + } + { + name = "mime"; + packageId = "mime"; + } + { + name = "percent-encoding"; + packageId = "percent-encoding"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "serde"; + packageId = "serde"; + } + { + name = "serde_json"; + packageId = "serde_json"; + optional = true; + features = [ "raw_value" ]; + } + { + name = "serde_path_to_error"; + packageId = "serde_path_to_error"; + optional = true; + } + { + name = "serde_urlencoded"; + packageId = "serde_urlencoded"; + optional = true; + } + { + name = "sync_wrapper"; + packageId = "sync_wrapper"; + } + { + name = "tokio"; + packageId = "tokio"; + rename = "tokio"; + optional = true; + features = [ "time" ]; + } + { + name = "tower"; + packageId = "tower"; + usesDefaultFeatures = false; + features = [ "util" ]; + } + { + name = "tower-layer"; + packageId = "tower-layer"; + } + { + name = "tower-service"; + packageId = "tower-service"; + } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + } + ]; + buildDependencies = [ + { + name = "rustversion"; + packageId = "rustversion"; + } + ]; + devDependencies = [ + { + name = "rustversion"; + packageId = "rustversion"; + } + { + name = "serde"; + packageId = "serde"; + features = [ "derive" ]; + } + { + name = "serde_json"; + packageId = "serde_json"; + } + { + name = "tokio"; + packageId = "tokio"; + rename = "tokio"; + features = [ "macros" "rt" "rt-multi-thread" "net" "test-util" ]; + } + { + name = "tower"; + packageId = "tower"; + rename = "tower"; + features = [ "util" "timeout" "limit" "load-shed" "steer" "filter" ]; + } + { + name = "tracing"; + packageId = "tracing"; + } + ]; + features = { + "__private_docs" = [ "tower/full" "dep:tower-http" ]; + "default" = [ "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ]; + "form" = [ "dep:serde_urlencoded" ]; + "http1" = [ "dep:hyper" "hyper?/http1" ]; + "http2" = [ "dep:hyper" "hyper?/http2" ]; + "json" = [ "dep:serde_json" "dep:serde_path_to_error" ]; + "macros" = [ "dep:axum-macros" ]; + "multipart" = [ "dep:multer" ]; + "query" = [ "dep:serde_urlencoded" ]; + "tokio" = [ "dep:hyper-util" "dep:tokio" "tokio/net" "tokio/rt" "tower/make" "tokio/macros" ]; + "tower-log" = [ "tower/log" ]; + "tracing" = [ "dep:tracing" "axum-core/tracing" ]; + "ws" = [ "dep:hyper" "tokio" "dep:tokio-tungstenite" "dep:sha1" "dep:base64" ]; + }; + resolvedDefaultFeatures = [ "default" "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" "tracing" ]; + }; + "axum-core 0.3.4" = rec { crateName = "axum-core"; version = "0.3.4"; edition = "2021"; @@ -779,11 +956,11 @@ rec { } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "http-body"; - packageId = "http-body"; + packageId = "http-body 0.4.6"; } { name = "mime"; @@ -817,6 +994,85 @@ rec { "tracing" = [ "dep:tracing" ]; }; }; + "axum-core 0.4.3" = rec { + crateName = "axum-core"; + version = "0.4.3"; + edition = "2021"; + sha256 = "1qx28wg4j6qdcdrisqwyaavlzc0zvbsrcwa99zf9456lfbyn6p51"; + dependencies = [ + { + name = "async-trait"; + packageId = "async-trait"; + } + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "http-body"; + packageId = "http-body 1.0.0"; + } + { + name = "http-body-util"; + packageId = "http-body-util"; + } + { + name = "mime"; + packageId = "mime"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "sync_wrapper"; + packageId = "sync_wrapper"; + } + { + name = "tower-layer"; + packageId = "tower-layer"; + } + { + name = "tower-service"; + packageId = "tower-service"; + } + { + name = "tracing"; + packageId = "tracing"; + optional = true; + usesDefaultFeatures = false; + } + ]; + buildDependencies = [ + { + name = "rustversion"; + packageId = "rustversion"; + } + ]; + devDependencies = [ + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + ]; + features = { + "__private_docs" = [ "dep:tower-http" ]; + "tracing" = [ "dep:tracing" ]; + }; + resolvedDefaultFeatures = [ "tracing" ]; + }; "backtrace" = rec { crateName = "backtrace"; version = "0.3.69"; @@ -3283,7 +3539,7 @@ rec { ]; }; - "h2" = rec { + "h2 0.3.24" = rec { crateName = "h2"; version = "0.3.24"; edition = "2018"; @@ -3318,7 +3574,79 @@ rec { } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; + } + { + name = "indexmap"; + packageId = "indexmap 2.1.0"; + features = [ "std" ]; + } + { + name = "slab"; + packageId = "slab"; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "io-util" ]; + } + { + name = "tokio-util"; + packageId = "tokio-util"; + features = [ "codec" "io" ]; + } + { + name = "tracing"; + packageId = "tracing"; + usesDefaultFeatures = false; + features = [ "std" ]; + } + ]; + devDependencies = [ + { + name = "tokio"; + packageId = "tokio"; + features = [ "rt-multi-thread" "macros" "sync" "net" ]; + } + ]; + features = { }; + }; + "h2 0.4.3" = rec { + crateName = "h2"; + version = "0.4.3"; + edition = "2021"; + sha256 = "1m4rj76zl77jany6p10k4mm1cqwsrlc1dmgmxwp3jy7kwk92vvji"; + authors = [ + "Carl Lerche " + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "fnv"; + packageId = "fnv"; + } + { + name = "futures-core"; + packageId = "futures-core"; + usesDefaultFeatures = false; + } + { + name = "futures-sink"; + packageId = "futures-sink"; + usesDefaultFeatures = false; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + } + { + name = "http"; + packageId = "http 1.1.0"; } { name = "indexmap"; @@ -3476,7 +3804,7 @@ rec { ]; }; - "http" = rec { + "http 0.2.11" = rec { crateName = "http"; version = "0.2.11"; edition = "2018"; @@ -3502,7 +3830,36 @@ rec { ]; }; - "http-body" = rec { + "http 1.1.0" = rec { + crateName = "http"; + version = "1.1.0"; + edition = "2018"; + sha256 = "0n426lmcxas6h75c2cp25m933pswlrfjz10v91vc62vib2sdvf91"; + authors = [ + "Alex Crichton " + "Carl Lerche " + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "fnv"; + packageId = "fnv"; + } + { + name = "itoa"; + packageId = "itoa"; + } + ]; + features = { + "default" = [ "std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "http-body 0.4.6" = rec { crateName = "http-body"; version = "0.4.6"; edition = "2018"; @@ -3519,7 +3876,63 @@ rec { } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + ]; + + }; + "http-body 1.0.0" = rec { + crateName = "http-body"; + version = "1.0.0"; + edition = "2018"; + sha256 = "0hyn8n3iadrbwq8y0p1rl1275s4nm49bllw5wji29g4aa3dqbb0w"; + authors = [ + "Carl Lerche " + "Lucio Franco " + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + ]; + + }; + "http-body-util" = rec { + crateName = "http-body-util"; + version = "0.1.1"; + edition = "2018"; + sha256 = "07agldas2qgcfc05ckiarlmf9vzragbda823nqhrqrc6mjrghx84"; + authors = [ + "Carl Lerche " + "Lucio Franco " + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-core"; + packageId = "futures-core"; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "http-body"; + packageId = "http-body 1.0.0"; } { name = "pin-project-lite"; @@ -3561,7 +3974,7 @@ rec { ]; }; - "hyper" = rec { + "hyper 0.14.28" = rec { crateName = "hyper"; version = "0.14.28"; edition = "2018"; @@ -3590,16 +4003,16 @@ rec { } { name = "h2"; - packageId = "h2"; + packageId = "h2 0.3.24"; optional = true; } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "http-body"; - packageId = "http-body"; + packageId = "http-body 0.4.6"; } { name = "httparse"; @@ -3668,6 +4081,104 @@ rec { }; resolvedDefaultFeatures = [ "client" "default" "full" "h2" "http1" "http2" "runtime" "server" "socket2" "stream" "tcp" ]; }; + "hyper 1.2.0" = rec { + crateName = "hyper"; + version = "1.2.0"; + edition = "2021"; + sha256 = "0fi6k7hz5fmdph0a5r8hw50d7h2n9zxkizmafcmb65f67bblhr8q"; + authors = [ + "Sean McArthur " + ]; + dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-channel"; + packageId = "futures-channel"; + optional = true; + } + { + name = "futures-util"; + packageId = "futures-util"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "h2"; + packageId = "h2 0.4.3"; + optional = true; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "http-body"; + packageId = "http-body 1.0.0"; + } + { + name = "httparse"; + packageId = "httparse"; + optional = true; + } + { + name = "httpdate"; + packageId = "httpdate"; + optional = true; + } + { + name = "itoa"; + packageId = "itoa"; + optional = true; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + optional = true; + } + { + name = "smallvec"; + packageId = "smallvec"; + optional = true; + features = [ "const_generics" "const_new" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "sync" ]; + } + ]; + devDependencies = [ + { + name = "futures-channel"; + packageId = "futures-channel"; + features = [ "sink" ]; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + features = [ "sink" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "fs" "macros" "net" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ]; + } + ]; + features = { + "client" = [ "dep:want" "dep:pin-project-lite" "dep:smallvec" ]; + "ffi" = [ "dep:libc" "dep:http-body-util" ]; + "full" = [ "client" "http1" "http2" "server" ]; + "http1" = [ "dep:futures-channel" "dep:futures-util" "dep:httparse" "dep:itoa" ]; + "http2" = [ "dep:futures-channel" "dep:futures-util" "dep:h2" ]; + "server" = [ "dep:httpdate" "dep:pin-project-lite" "dep:smallvec" ]; + "tracing" = [ "dep:tracing" ]; + }; + resolvedDefaultFeatures = [ "default" "http1" "http2" "server" ]; + }; "hyper-rustls" = rec { crateName = "hyper-rustls"; version = "0.24.2"; @@ -3681,17 +4192,17 @@ rec { } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; usesDefaultFeatures = false; features = [ "client" ]; } { name = "rustls"; - packageId = "rustls"; + packageId = "rustls 0.21.10"; usesDefaultFeatures = false; } { @@ -3700,19 +4211,19 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls"; + packageId = "tokio-rustls 0.24.1"; usesDefaultFeatures = false; } ]; devDependencies = [ { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; features = [ "full" ]; } { name = "rustls"; - packageId = "rustls"; + packageId = "rustls 0.21.10"; usesDefaultFeatures = false; features = [ "tls12" ]; } @@ -3737,46 +4248,122 @@ rec { "webpki-tokio" = [ "tokio-runtime" "webpki-roots" ]; }; }; - "hyper-timeout" = rec { - crateName = "hyper-timeout"; - version = "0.4.1"; - edition = "2018"; - sha256 = "1c8k3g8k2yh1gxvsx9p7amkimgxhl9kafwpj7jyf8ywc5r45ifdv"; + "hyper-timeout" = rec { + crateName = "hyper-timeout"; + version = "0.4.1"; + edition = "2018"; + sha256 = "1c8k3g8k2yh1gxvsx9p7amkimgxhl9kafwpj7jyf8ywc5r45ifdv"; + authors = [ + "Herman J. Radtke III " + ]; + dependencies = [ + { + name = "hyper"; + packageId = "hyper 0.14.28"; + features = [ "client" ]; + } + { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + } + { + name = "tokio"; + packageId = "tokio"; + } + { + name = "tokio-io-timeout"; + packageId = "tokio-io-timeout"; + } + ]; + devDependencies = [ + { + name = "hyper"; + packageId = "hyper 0.14.28"; + features = [ "client" "http1" "tcp" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "io-std" "io-util" "macros" ]; + } + ]; + + }; + "hyper-util" = rec { + crateName = "hyper-util"; + version = "0.1.3"; + edition = "2021"; + sha256 = "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a"; authors = [ - "Herman J. Radtke III " + "Sean McArthur " ]; dependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "futures-util"; + packageId = "futures-util"; + usesDefaultFeatures = false; + } + { + name = "http"; + packageId = "http 1.1.0"; + } + { + name = "http-body"; + packageId = "http-body 1.0.0"; + } { name = "hyper"; - packageId = "hyper"; - features = [ "client" ]; + packageId = "hyper 1.2.0"; } { name = "pin-project-lite"; packageId = "pin-project-lite"; } { - name = "tokio"; - packageId = "tokio"; + name = "socket2"; + packageId = "socket2"; + optional = true; + features = [ "all" ]; } { - name = "tokio-io-timeout"; - packageId = "tokio-io-timeout"; + name = "tokio"; + packageId = "tokio"; + optional = true; + features = [ "net" "rt" "time" ]; } ]; devDependencies = [ + { + name = "bytes"; + packageId = "bytes"; + } { name = "hyper"; - packageId = "hyper"; - features = [ "client" "http1" "tcp" ]; + packageId = "hyper 1.2.0"; + features = [ "full" ]; } { name = "tokio"; packageId = "tokio"; - features = [ "io-std" "io-util" "macros" ]; + features = [ "macros" "test-util" ]; } ]; - + features = { + "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower" "dep:tower-service" ]; + "client-legacy" = [ "client" ]; + "full" = [ "client" "client-legacy" "server" "server-auto" "service" "http1" "http2" "tokio" ]; + "http1" = [ "hyper/http1" ]; + "http2" = [ "hyper/http2" ]; + "server" = [ "hyper/server" ]; + "server-auto" = [ "server" "http1" "http2" ]; + "service" = [ "dep:tower" "dep:tower-service" ]; + "tokio" = [ "dep:tokio" "dep:socket2" ]; + }; + resolvedDefaultFeatures = [ "default" "http1" "http2" "server" "server-auto" "tokio" ]; }; "iana-time-zone" = rec { crateName = "iana-time-zone"; @@ -5399,7 +5986,7 @@ rec { } { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; optional = true; usesDefaultFeatures = false; } @@ -5493,7 +6080,7 @@ rec { devDependencies = [ { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; features = [ "server" ]; } { @@ -5626,7 +6213,7 @@ rec { } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; optional = true; } { @@ -7347,21 +7934,21 @@ rec { } { name = "h2"; - packageId = "h2"; + packageId = "h2 0.3.24"; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "http-body"; - packageId = "http-body"; + packageId = "http-body 0.4.6"; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "tcp" "http1" "http2" "client" "runtime" ]; @@ -7410,14 +7997,14 @@ rec { } { name = "rustls"; - packageId = "rustls"; + packageId = "rustls 0.21.10"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "dangerous_configuration" ]; } { name = "rustls-native-certs"; - packageId = "rustls-native-certs"; + packageId = "rustls-native-certs 0.6.3"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } @@ -7459,7 +8046,7 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls"; + packageId = "tokio-rustls 0.24.1"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } @@ -7510,7 +8097,7 @@ rec { devDependencies = [ { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "tcp" "stream" "http1" "http2" "client" "server" "runtime" ]; @@ -7940,7 +8527,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "fs" "std" "termios" "use-libc-auxv" ]; }; - "rustls" = rec { + "rustls 0.21.10" = rec { crateName = "rustls"; version = "0.21.10"; edition = "2021"; @@ -7957,7 +8544,7 @@ rec { } { name = "rustls-webpki"; - packageId = "rustls-webpki"; + packageId = "rustls-webpki 0.101.7"; rename = "webpki"; features = [ "alloc" "std" ]; } @@ -7981,7 +8568,63 @@ rec { }; resolvedDefaultFeatures = [ "dangerous_configuration" "default" "log" "logging" "tls12" ]; }; - "rustls-native-certs" = rec { + "rustls 0.22.2" = rec { + crateName = "rustls"; + version = "0.22.2"; + edition = "2021"; + sha256 = "0hcxyhq6ynvws9v5b2h81s1nwmijmya7a3vyyyhsy1wqpmb9jz78"; + dependencies = [ + { + name = "log"; + packageId = "log"; + optional = true; + } + { + name = "ring"; + packageId = "ring"; + optional = true; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + features = [ "std" ]; + } + { + name = "rustls-webpki"; + packageId = "rustls-webpki 0.102.2"; + rename = "webpki"; + usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "subtle"; + packageId = "subtle"; + usesDefaultFeatures = false; + } + { + name = "zeroize"; + packageId = "zeroize"; + } + ]; + devDependencies = [ + { + name = "log"; + packageId = "log"; + } + ]; + features = { + "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws_lc_rs" ]; + "default" = [ "logging" "ring" "tls12" ]; + "log" = [ "dep:log" ]; + "logging" = [ "log" ]; + "read_buf" = [ "rustversion" ]; + "ring" = [ "dep:ring" "webpki/ring" ]; + "rustversion" = [ "dep:rustversion" ]; + }; + resolvedDefaultFeatures = [ "log" "logging" "ring" "tls12" ]; + }; + "rustls-native-certs 0.6.3" = rec { crateName = "rustls-native-certs"; version = "0.6.3"; edition = "2021"; @@ -8008,6 +8651,39 @@ rec { } ]; + }; + "rustls-native-certs 0.7.0" = rec { + crateName = "rustls-native-certs"; + version = "0.7.0"; + edition = "2021"; + sha256 = "14ip15dcr6fmjzi12lla9cpln7mmkdid4a7wsp344v4kz9gbh7wg"; + dependencies = [ + { + name = "openssl-probe"; + packageId = "openssl-probe"; + target = { target, features }: ((target."unix" or false) && (!("macos" == target."os" or null))); + } + { + name = "rustls-pemfile"; + packageId = "rustls-pemfile 2.1.0"; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } + { + name = "schannel"; + packageId = "schannel"; + target = { target, features }: (target."windows" or false); + } + { + name = "security-framework"; + packageId = "security-framework"; + target = { target, features }: ("macos" == target."os" or null); + } + ]; + }; "rustls-pemfile 1.0.4" = rec { crateName = "rustls-pemfile"; @@ -8044,7 +8720,7 @@ rec { "default" = [ "std" ]; "std" = [ "base64/std" ]; }; - resolvedDefaultFeatures = [ "std" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; "rustls-pki-types" = rec { crateName = "rustls-pki-types"; @@ -8055,9 +8731,9 @@ rec { "default" = [ "alloc" ]; "std" = [ "alloc" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" ]; + resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; - "rustls-webpki" = rec { + "rustls-webpki 0.101.7" = rec { crateName = "rustls-webpki"; version = "0.101.7"; edition = "2021"; @@ -8081,6 +8757,39 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; + "rustls-webpki 0.102.2" = rec { + crateName = "rustls-webpki"; + version = "0.102.2"; + edition = "2021"; + sha256 = "041ncshpw8wsvi8p74a3yw9c0r17lhyk1yjsxyrbkv8bfii0maps"; + libName = "webpki"; + dependencies = [ + { + name = "ring"; + packageId = "ring"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + usesDefaultFeatures = false; + } + { + name = "untrusted"; + packageId = "untrusted"; + } + ]; + features = { + "alloc" = [ "ring?/alloc" "pki-types/alloc" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" ]; + "default" = [ "std" "ring" ]; + "ring" = [ "dep:ring" ]; + "std" = [ "alloc" "pki-types/std" ]; + }; + resolvedDefaultFeatures = [ "alloc" "ring" "std" ]; + }; "rustversion" = rec { crateName = "rustversion"; version = "1.0.14"; @@ -8497,7 +9206,27 @@ rec { "preserve_order" = [ "indexmap" "std" ]; "std" = [ "serde/std" ]; }; - resolvedDefaultFeatures = [ "default" "std" ]; + resolvedDefaultFeatures = [ "default" "raw_value" "std" ]; + }; + "serde_path_to_error" = rec { + crateName = "serde_path_to_error"; + version = "0.1.16"; + edition = "2021"; + sha256 = "19hlz2359l37ifirskpcds7sxg0gzpqvfilibs7whdys0128i6dg"; + authors = [ + "David Tolnay " + ]; + dependencies = [ + { + name = "itoa"; + packageId = "itoa"; + } + { + name = "serde"; + packageId = "serde"; + } + ]; + }; "serde_spanned" = rec { crateName = "serde_spanned"; @@ -8785,6 +9514,7 @@ rec { "drain_keep_rest" = [ "drain_filter" ]; "serde" = [ "dep:serde" ]; }; + resolvedDefaultFeatures = [ "const_generics" "const_new" ]; }; "smol_str" = rec { crateName = "smol_str"; @@ -9730,10 +10460,15 @@ rec { }; "tokio-listener" = rec { crateName = "tokio-listener"; - version = "0.2.2"; + version = "0.3.2"; edition = "2021"; - sha256 = "0iaxcxbjhl2dk6b0w2bwm7qiryp119zgdhgqma169kmncn2xg7k6"; + sha256 = "00vkr1cywd2agn8jbkzwwf7y4ps3cfjm8l9ab697px2cgc97wdln"; dependencies = [ + { + name = "axum"; + packageId = "axum 0.7.4"; + rename = "axum07"; + } { name = "document-features"; packageId = "document-features"; @@ -9743,10 +10478,9 @@ rec { packageId = "futures-core"; } { - name = "hyper"; - packageId = "hyper"; + name = "futures-util"; + packageId = "futures-util"; optional = true; - features = [ "server" ]; } { name = "nix"; @@ -9771,9 +10505,16 @@ rec { packageId = "tokio"; features = [ "net" "io-std" "time" "sync" ]; } + { + name = "tokio-util"; + packageId = "tokio-util"; + optional = true; + features = [ "net" "codec" ]; + } { name = "tonic"; - packageId = "tonic 0.10.2"; + packageId = "tonic 0.11.0"; + rename = "tonic"; optional = true; } { @@ -9782,37 +10523,30 @@ rec { } ]; devDependencies = [ - { - name = "hyper"; - packageId = "hyper"; - features = [ "server" "http1" ]; - } { name = "tokio"; packageId = "tokio"; features = [ "macros" "rt" "io-util" ]; } - { - name = "tonic"; - packageId = "tonic 0.10.2"; - } ]; features = { + "axum07" = [ "dep:hyper1" "dep:hyper-util" "dep:futures-util" "dep:tower-service" "dep:tower" ]; "clap" = [ "dep:clap" ]; - "default" = [ "hyper014" "user_facing_default" ]; - "hyper" = [ "dep:hyper" ]; - "hyper014" = [ "hyper" ]; + "default" = [ "user_facing_default" "tokio-util" ]; + "hyper014" = [ "dep:hyper014" ]; + "inetd" = [ "dep:futures-util" ]; "nix" = [ "dep:nix" ]; "serde" = [ "dep:serde" "serde_with" ]; "serde_with" = [ "dep:serde_with" ]; "socket2" = [ "dep:socket2" ]; "socket_options" = [ "socket2" ]; - "tonic" = [ "dep:tonic" ]; - "tonic010" = [ "tonic" ]; + "tokio-util" = [ "dep:tokio-util" ]; + "tonic010" = [ "dep:tonic_010" ]; + "tonic011" = [ "dep:tonic" ]; "unix_path_tools" = [ "nix" ]; "user_facing_default" = [ "inetd" "unix" "unix_path_tools" "sd_listen" "socket_options" ]; }; - resolvedDefaultFeatures = [ "default" "hyper" "hyper014" "inetd" "nix" "sd_listen" "socket2" "socket_options" "tonic" "tonic010" "unix" "unix_path_tools" "user_facing_default" ]; + resolvedDefaultFeatures = [ "default" "inetd" "nix" "sd_listen" "socket2" "socket_options" "tokio-util" "tonic011" "unix" "unix_path_tools" "user_facing_default" ]; }; "tokio-macros" = rec { crateName = "tokio-macros"; @@ -9872,7 +10606,7 @@ rec { ]; }; - "tokio-rustls" = rec { + "tokio-rustls 0.24.1" = rec { crateName = "tokio-rustls"; version = "0.24.1"; edition = "2018"; @@ -9880,7 +10614,7 @@ rec { dependencies = [ { name = "rustls"; - packageId = "rustls"; + packageId = "rustls 0.21.10"; usesDefaultFeatures = false; } { @@ -9904,6 +10638,42 @@ rec { }; resolvedDefaultFeatures = [ "default" "logging" "tls12" ]; }; + "tokio-rustls 0.25.0" = rec { + crateName = "tokio-rustls"; + version = "0.25.0"; + edition = "2021"; + sha256 = "03w6d5aqqf084rmcmrsyq5grhydl53blaiqcl0i2yfnv187hqpkp"; + dependencies = [ + { + name = "rustls"; + packageId = "rustls 0.22.2"; + usesDefaultFeatures = false; + } + { + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; + rename = "pki-types"; + } + { + name = "tokio"; + packageId = "tokio"; + } + ]; + devDependencies = [ + { + name = "tokio"; + packageId = "tokio"; + features = [ "full" ]; + } + ]; + features = { + "default" = [ "logging" "tls12" "ring" ]; + "logging" = [ "rustls/logging" ]; + "ring" = [ "rustls/ring" ]; + "tls12" = [ "rustls/tls12" ]; + }; + resolvedDefaultFeatures = [ "default" "logging" "ring" "tls12" ]; + }; "tokio-stream" = rec { crateName = "tokio-stream"; version = "0.1.14"; @@ -10111,7 +10881,7 @@ rec { "time" = [ "tokio/time" "slab" ]; "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "codec" "compat" "default" "futures-io" "io" "io-util" "tracing" ]; + resolvedDefaultFeatures = [ "codec" "compat" "default" "futures-io" "io" "io-util" "net" "tracing" ]; }; "toml" = rec { crateName = "toml"; @@ -10220,11 +10990,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "serde" ]; }; - "tonic 0.10.2" = rec { + "tonic 0.11.0" = rec { crateName = "tonic"; - version = "0.10.2"; + version = "0.11.0"; edition = "2021"; - sha256 = "03hx1b2810p4jmsphbql8cn3r22c9n1ar73bj8azf7761lx96q6m"; + sha256 = "04qsr527i256i3dk9dp1g2jr42q7yl91y5h06rvd9ycy9rxfpi3n"; authors = [ "Lucio Franco " ]; @@ -10241,7 +11011,7 @@ rec { } { name = "axum"; - packageId = "axum"; + packageId = "axum 0.6.20"; optional = true; usesDefaultFeatures = false; } @@ -10255,20 +11025,20 @@ rec { } { name = "h2"; - packageId = "h2"; + packageId = "h2 0.3.24"; optional = true; } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "http-body"; - packageId = "http-body"; + packageId = "http-body 0.4.6"; } { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; optional = true; features = [ "full" ]; } @@ -10293,18 +11063,18 @@ rec { features = [ "std" ]; } { - name = "rustls"; - packageId = "rustls"; + name = "rustls-native-certs"; + packageId = "rustls-native-certs 0.7.0"; optional = true; } { - name = "rustls-native-certs"; - packageId = "rustls-native-certs"; + name = "rustls-pemfile"; + packageId = "rustls-pemfile 2.1.0"; optional = true; } { - name = "rustls-pemfile"; - packageId = "rustls-pemfile 1.0.4"; + name = "rustls-pki-types"; + packageId = "rustls-pki-types"; optional = true; } { @@ -10313,7 +11083,7 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls"; + packageId = "tokio-rustls 0.25.0"; optional = true; } { @@ -10357,11 +11127,12 @@ rec { "default" = [ "transport" "codegen" "prost" ]; "gzip" = [ "dep:flate2" ]; "prost" = [ "dep:prost" ]; - "tls" = [ "dep:rustls-pemfile" "transport" "dep:tokio-rustls" "dep:rustls" "tokio/rt" "tokio/macros" ]; + "tls" = [ "dep:rustls-pki-types" "dep:rustls-pemfile" "transport" "dep:tokio-rustls" "tokio/rt" "tokio/macros" ]; "tls-roots" = [ "tls-roots-common" "dep:rustls-native-certs" ]; "tls-roots-common" = [ "tls" ]; "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" ]; + "zstd" = [ "dep:zstd" ]; }; resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "tls" "tls-roots" "tls-roots-common" "transport" ]; }; @@ -10381,7 +11152,7 @@ rec { } { name = "axum"; - packageId = "axum"; + packageId = "axum 0.6.20"; optional = true; usesDefaultFeatures = false; } @@ -10405,20 +11176,20 @@ rec { } { name = "h2"; - packageId = "h2"; + packageId = "h2 0.3.24"; optional = true; } { name = "http"; - packageId = "http"; + packageId = "http 0.2.11"; } { name = "http-body"; - packageId = "http-body"; + packageId = "http-body 0.4.6"; } { name = "hyper"; - packageId = "hyper"; + packageId = "hyper 0.14.28"; optional = true; features = [ "full" ]; } @@ -10500,9 +11271,9 @@ rec { }; "tonic-build" = rec { crateName = "tonic-build"; - version = "0.10.2"; + version = "0.11.0"; edition = "2021"; - sha256 = "129qd12ka65h5f1dzi5mrlz6wndi0pfx1320lawq51f18k01y0lx"; + sha256 = "1hm99ckaw0pzq8h22bdjy6gpbg06kpvs0f73nj60f456f3fzckmy"; authors = [ "Lucio Franco " ]; @@ -10539,9 +11310,9 @@ rec { }; "tonic-reflection" = rec { crateName = "tonic-reflection"; - version = "0.10.2"; + version = "0.11.0"; edition = "2021"; - sha256 = "0xhvp8f7ysyb3vqnb0knq4dfzf8qr4l1v8jbgwcrsczi7m8pr8rz"; + sha256 = "19xn3kyg062d7y1cnw537v9cxkzzcrnfri0jb29fbyn0smxj532l"; authors = [ "James Nugent " "Samani G. Gikandi " @@ -10554,20 +11325,23 @@ rec { { name = "prost-types"; packageId = "prost-types"; + optional = true; } { name = "tokio"; packageId = "tokio"; + optional = true; features = [ "sync" "rt" ]; } { name = "tokio-stream"; packageId = "tokio-stream"; + optional = true; features = [ "net" ]; } { name = "tonic"; - packageId = "tonic 0.10.2"; + packageId = "tonic 0.11.0"; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } @@ -10575,12 +11349,17 @@ rec { devDependencies = [ { name = "tonic"; - packageId = "tonic 0.10.2"; + packageId = "tonic 0.11.0"; usesDefaultFeatures = false; features = [ "transport" ]; } ]; - + features = { + "default" = [ "server" ]; + "prost-types" = [ "dep:prost-types" ]; + "server" = [ "prost-types" "dep:tokio" "dep:tokio-stream" ]; + }; + resolvedDefaultFeatures = [ "default" "prost-types" "server" ]; }; "tower" = rec { crateName = "tower"; @@ -11134,11 +11913,11 @@ rec { { name = "tokio-listener"; packageId = "tokio-listener"; - features = [ "tonic010" ]; + features = [ "tonic011" ]; } { name = "tonic"; - packageId = "tonic 0.10.2"; + packageId = "tonic 0.11.0"; features = [ "tls" "tls-roots" ]; } { @@ -11290,7 +12069,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.10.2"; + packageId = "tonic 0.11.0"; } { name = "tonic-reflection"; @@ -11980,7 +12759,7 @@ rec { { name = "tokio-listener"; packageId = "tokio-listener"; - features = [ "tonic010" ]; + features = [ "tonic011" ]; } { name = "tokio-stream"; @@ -11994,7 +12773,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.10.2"; + packageId = "tonic 0.11.0"; features = [ "tls" "tls-roots" ]; } { @@ -14333,7 +15112,7 @@ rec { "std" = [ "alloc" ]; "zeroize_derive" = [ "dep:zeroize_derive" ]; }; - resolvedDefaultFeatures = [ "alloc" ]; + resolvedDefaultFeatures = [ "alloc" "default" ]; }; "zstd" = rec { crateName = "zstd"; diff --git a/tvix/build/Cargo.toml b/tvix/build/Cargo.toml index 289dda4d8c0d..bda2d136c759 100644 --- a/tvix/build/Cargo.toml +++ b/tvix/build/Cargo.toml @@ -10,8 +10,8 @@ itertools = "0.12.0" prost = "0.12.1" thiserror = "1.0.56" tokio = { version = "1.32.0" } -tokio-listener = { version = "0.2.2", features = [ "tonic010" ] } -tonic = { version = "0.10.2", features = ["tls", "tls-roots"] } +tokio-listener = { version = "0.3.2", features = [ "tonic011" ] } +tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } tvix-castore = { path = "../castore" } tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", features = ["json"] } @@ -19,11 +19,11 @@ url = "2.4.0" [dependencies.tonic-reflection] optional = true -version = "0.10.2" +version = "0.11.0" [build-dependencies] prost-build = "0.12.1" -tonic-build = "0.10.2" +tonic-build = "0.11.0" [features] default = [] diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index 36b2d7ad50ce..69834ed2e3b4 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -23,7 +23,7 @@ thiserror = "1.0.38" tokio-stream = { version = "0.1.14", features = ["fs", "net"] } 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" +tonic = "0.11.0" tower = "0.4.13" tracing = "0.1.37" url = "2.4.0" @@ -40,7 +40,7 @@ version = "0.2.144" [dependencies.tonic-reflection] optional = true -version = "0.10.2" +version = "0.11.0" [dependencies.vhost] optional = true @@ -68,7 +68,7 @@ version = "0.2.1" [build-dependencies] prost-build = "0.12.1" -tonic-build = "0.10.2" +tonic-build = "0.11.0" [dev-dependencies] test-case = "3.3.1" diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index 84b78ca15070..d57ed3a2899b 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,4 +1,4 @@ { "test-generator 0.3.0 (git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41)": "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y", "wu-manber 0.1.0 (git+https://github.com/tvlfyi/wu-manber.git#0d5b22bea136659f7de60b102a7030e0daaa503d)": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" -} \ No newline at end of file +} diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index ec7acbd562be..2dd155dbbc2e 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -24,10 +24,10 @@ sha2 = "0.10.6" sled = { version = "0.34.7" } thiserror = "1.0.38" tokio = { version = "1.32.0", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } -tokio-listener = { version = "0.2.2", features = [ "tonic010" ] } +tokio-listener = { version = "0.3.2", features = [ "tonic011" ] } tokio-stream = { version = "0.1.14", features = ["fs"] } tokio-util = { version = "0.7.9", features = ["io", "io-util", "compat"] } -tonic = { version = "0.10.2", features = ["tls", "tls-roots"] } +tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } tower = "0.4.13" tracing = "0.1.37" tracing-opentelemetry = "0.22.0" @@ -41,11 +41,11 @@ xz2 = "0.1.7" [dependencies.tonic-reflection] optional = true -version = "0.10.2" +version = "0.11.0" [build-dependencies] prost-build = "0.12.1" -tonic-build = "0.10.2" +tonic-build = "0.11.0" [dev-dependencies] test-case = "3.3.1" -- cgit 1.4.1