diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 15c89ed69..5c6aecb03 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -303,34 +303,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "itoa", - "matchit 0.7.3", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.5" @@ -338,13 +310,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core", "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.0", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "itoa", "matchit 0.7.3", @@ -365,23 +337,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.3" @@ -391,8 +346,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.0", + "http", + "http-body", "http-body-util", "mime", "pin-project-lite", @@ -439,24 +394,23 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bigtable_rs" version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ccba0acd0a82afb2b1fe89181b0776ff18aef5e355030631fe534c8ae8ec73" +source = "git+https://github.com/liufuyang/bigtable_rs?rev=1818355a5373a5bc2c84287e3a4e3807154ac8ef#1818355a5373a5bc2c84287e3a4e3807154ac8ef" dependencies = [ "gcp_auth", - "http 0.2.11", + "http", + "hyper-util", "log", - "prost 0.12.3", - "prost-build 0.12.3", - "prost-types 0.12.3", + "prost", + "prost-build", + "prost-types", "prost-wkt", - "prost-wkt-build", "prost-wkt-types", "serde", "serde_with", "thiserror", "tokio", - "tonic 0.11.0", - "tonic-build 0.11.0", + "tonic", + "tonic-build", "tower", ] @@ -1411,19 +1365,22 @@ dependencies = [ [[package]] name = "gcp_auth" -version = "0.10.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2c71ea685b88a1aa50e9fb66fe0e1cb29d755f58cca41fb8c91ef604d4f4d4" +checksum = "536c79e79dde296a800738474691e97031769bed9b54e6dd0401b169d35d693d" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", + "bytes", "chrono", "home", - "hyper 0.14.28", - "hyper-rustls 0.24.2", + "http", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", "ring", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "thiserror", @@ -1431,7 +1388,6 @@ dependencies = [ "tracing", "tracing-futures", "url", - "which 5.0.0", ] [[package]] @@ -1498,25 +1454,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.11", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.4" @@ -1528,7 +1465,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 1.1.0", + "http", "indexmap 2.1.0", "slab", "tokio", @@ -1591,17 +1528,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -1613,17 +1539,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.11", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.0" @@ -1631,7 +1546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -1642,8 +1557,8 @@ checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", "futures-core", - "http 1.1.0", - "http-body 1.0.0", + "http", + "http-body", "pin-project-lite", ] @@ -1665,30 +1580,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -1698,9 +1589,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", - "http 1.1.0", - "http-body 1.0.0", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -1710,21 +1601,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.11", - "hyper 0.14.28", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.2" @@ -1732,36 +1608,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.4.1", + "http", + "hyper", "hyper-util", - "rustls 0.23.7", - "rustls-native-certs 0.7.0", + "rustls", + "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.28", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-timeout" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper 1.4.1", + "hyper", "hyper-util", "pin-project-lite", "tokio", @@ -1777,9 +1641,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.4.1", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -1904,15 +1768,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.0" @@ -2239,7 +2094,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" name = "nar-bridge" version = "0.1.0" dependencies = [ - "axum 0.7.5", + "axum", "bytes", "clap", "data-encoding", @@ -2250,16 +2105,16 @@ dependencies = [ "mimalloc", "nix-compat", "parking_lot 0.12.3", - "prost 0.13.1", - "prost-build 0.13.1", + "prost", + "prost-build", "rstest", "serde", "thiserror", "tokio", "tokio-listener", "tokio-util", - "tonic 0.12.2", - "tonic-build 0.12.2", + "tonic", + "tonic-build", "tower", "tower-http", "tracing", @@ -2476,7 +2331,7 @@ dependencies = [ "chrono", "futures", "humantime", - "hyper 1.4.1", + "hyper", "itertools 0.12.0", "md-5", "parking_lot 0.12.3", @@ -2485,7 +2340,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.0", + "rustls-pemfile", "serde", "serde_json", "snafu", @@ -2550,7 +2405,7 @@ checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" dependencies = [ "async-trait", "bytes", - "http 1.1.0", + "http", "opentelemetry 0.24.0", ] @@ -2562,14 +2417,14 @@ checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" dependencies = [ "async-trait", "futures-core", - "http 1.1.0", + "http", "opentelemetry 0.24.0", "opentelemetry-proto", "opentelemetry_sdk 0.24.1", - "prost 0.13.1", + "prost", "thiserror", "tokio", - "tonic 0.12.2", + "tonic", ] [[package]] @@ -2580,8 +2435,8 @@ checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ "opentelemetry 0.24.0", "opentelemetry_sdk 0.24.1", - "prost 0.13.1", - "tonic 0.12.2", + "prost", + "tonic", ] [[package]] @@ -2896,16 +2751,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes", - "prost-derive 0.12.3", -] - [[package]] name = "prost" version = "0.13.1" @@ -2913,31 +2758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", - "prost-derive 0.13.1", -] - -[[package]] -name = "prost-build" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" -dependencies = [ - "bytes", - "heck", - "itertools 0.11.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.12.3", - "prost-types 0.12.3", - "pulldown-cmark", - "pulldown-cmark-to-cmark", - "regex", - "syn 2.0.72", - "tempfile", - "which 4.4.2", + "prost-derive", ] [[package]] @@ -2954,26 +2775,15 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", + "pulldown-cmark", + "pulldown-cmark-to-cmark", "regex", "syn 2.0.72", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "prost-derive" version = "0.13.1" @@ -2987,33 +2797,24 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -dependencies = [ - "prost 0.12.3", -] - [[package]] name = "prost-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ - "prost 0.13.1", + "prost", ] [[package]] name = "prost-wkt" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d8ef9c3f0f1dab910d2b7e2c24a8e4322e122eba6d7a1921eeebcebbc046c40" +checksum = "a8d84e2bee181b04c2bac339f2bfe818c46a99750488cc6728ce4181d5aa8299" dependencies = [ "chrono", "inventory", - "prost 0.12.3", + "prost", "serde", "serde_derive", "serde_json", @@ -3022,27 +2823,27 @@ dependencies = [ [[package]] name = "prost-wkt-build" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b31cae9a54ca84fee1504740a82eebf2479532905e106f63ca0c3bc8d780321" +checksum = "8a669d5acbe719010c6f62a64e6d7d88fdedc1fe46e419747949ecb6312e9b14" dependencies = [ "heck", - "prost 0.12.3", - "prost-build 0.12.3", - "prost-types 0.12.3", + "prost", + "prost-build", + "prost-types", "quote", ] [[package]] name = "prost-wkt-types" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435be4a8704091b4c5fb1d79799de7f2dbff53af05edf29385237f8cf7ab37ee" +checksum = "01ef068e9b82e654614b22e6b13699bd545b6c0e2e721736008b00b38aeb4f64" dependencies = [ "chrono", - "prost 0.12.3", - "prost-build 0.12.3", - "prost-types 0.12.3", + "prost", + "prost-build", + "prost-types", "prost-wkt", "prost-wkt-build", "regex", @@ -3092,7 +2893,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 1.1.0", - "rustls 0.23.7", + "rustls", "thiserror", "tokio", "tracing", @@ -3108,7 +2909,7 @@ dependencies = [ "rand", "ring", "rustc-hash 1.1.0", - "rustls 0.23.7", + "rustls", "slab", "thiserror", "tinyvec", @@ -3313,12 +3114,12 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2 0.4.4", - "http 1.1.0", - "http-body 1.0.0", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper", + "hyper-rustls", "hyper-util", "ipnet", "js-sys", @@ -3328,16 +3129,16 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.7", - "rustls-native-certs 0.7.0", - "rustls-pemfile 2.1.0", + "rustls", + "rustls-native-certs", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -3356,7 +3157,7 @@ checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", + "http", "reqwest", "serde", "thiserror", @@ -3372,7 +3173,7 @@ dependencies = [ "anyhow", "async-trait", "getrandom", - "http 1.1.0", + "http", "matchit 0.8.4", "opentelemetry 0.22.0", "reqwest", @@ -3498,32 +3299,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.2", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.7" @@ -3534,23 +3309,11 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -3558,21 +3321,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.0", + "rustls-pemfile", "rustls-pki-types", "schannel", "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.1.0" @@ -3589,16 +3343,6 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.102.2" @@ -3675,16 +3419,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "2.9.2" @@ -4207,35 +3941,25 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-listener" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914a439d123292125bc806649c396d23e1aac5da4052f0d97b23137b38782f46" dependencies = [ - "axum 0.7.5", + "axum", "clap", "document-features", "futures-core", "futures-util", - "hyper 1.4.1", + "hyper", "hyper-util", "nix 0.26.4", "pin-project", "socket2", "tokio", "tokio-util", - "tonic 0.12.2", + "tonic", "tower", "tower-service", "tracing", @@ -4263,34 +3987,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "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.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.7", + "rustls", "rustls-pki-types", "tokio", ] @@ -4417,36 +4120,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-stream", - "async-trait", - "axum 0.6.20", - "base64 0.21.7", - "bytes", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-timeout 0.4.1", - "percent-encoding", - "pin-project", - "prost 0.12.3", - "rustls-pemfile 2.1.0", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.25.0", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.12.2" @@ -4455,24 +4128,24 @@ checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" dependencies = [ "async-stream", "async-trait", - "axum 0.7.5", + "axum", "base64 0.22.1", "bytes", - "h2 0.4.4", - "http 1.1.0", - "http-body 1.0.0", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", - "hyper-timeout 0.5.1", + "hyper", + "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.1", - "rustls-native-certs 0.7.0", - "rustls-pemfile 2.1.0", + "prost", + "rustls-native-certs", + "rustls-pemfile", "socket2", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-stream", "tower", "tower-layer", @@ -4480,19 +4153,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tonic-build" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build 0.12.3", - "quote", - "syn 2.0.72", -] - [[package]] name = "tonic-build" version = "0.12.2" @@ -4501,7 +4161,7 @@ checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67" dependencies = [ "prettyplease", "proc-macro2", - "prost-build 0.13.1", + "prost-build", "quote", "syn 2.0.72", ] @@ -4513,10 +4173,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e10e6a96ee08b6ce443487d4368442d328d0e746f3681f81127f7dc41b4955" dependencies = [ "async-stream", - "prost 0.13.1", + "prost", "tokio", "tokio-stream", - "tonic 0.12.2", + "tonic", ] [[package]] @@ -4525,11 +4185,11 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b56b874eedb04f89907573b408eab1e87c1c1dce43aac6ad63742f57faa99ff" dependencies = [ - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "tokio", "tokio-stream", - "tonic 0.12.2", + "tonic", ] [[package]] @@ -4560,8 +4220,8 @@ checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "bitflags 2.4.2", "bytes", - "http 1.1.0", - "http-body 1.0.0", + "http", + "http-body", "http-body-util", "pin-project-lite", "tower-layer", @@ -4760,14 +4420,14 @@ dependencies = [ "clap", "itertools 0.12.0", "mimalloc", - "prost 0.13.1", - "prost-build 0.13.1", + "prost", + "prost-build", "rstest", "thiserror", "tokio", "tokio-listener", - "tonic 0.12.2", - "tonic-build 0.12.2", + "tonic", + "tonic-build", "tonic-reflection", "tracing", "tvix-castore", @@ -4801,8 +4461,8 @@ dependencies = [ "parking_lot 0.12.3", "petgraph", "pin-project-lite", - "prost 0.13.1", - "prost-build 0.13.1", + "prost", + "prost-build", "redb", "rstest", "rstest_reuse", @@ -4820,8 +4480,8 @@ dependencies = [ "tokio-stream", "tokio-tar", "tokio-util", - "tonic 0.12.2", - "tonic-build 0.12.2", + "tonic", + "tonic-build", "tonic-reflection", "tower", "tracing", @@ -4993,8 +4653,8 @@ dependencies = [ "nix-compat", "parking_lot 0.12.3", "pin-project-lite", - "prost 0.13.1", - "prost-build 0.13.1", + "prost", + "prost-build", "redb", "reqwest", "reqwest-middleware", @@ -5014,8 +4674,8 @@ dependencies = [ "tokio-stream", "tokio-util", "toml 0.8.15", - "tonic 0.12.2", - "tonic-build 0.12.2", + "tonic", + "tonic-build", "tonic-health", "tonic-reflection", "tower", @@ -5032,8 +4692,8 @@ dependencies = [ name = "tvix-tracing" version = "0.1.0" dependencies = [ - "axum 0.7.5", - "http 1.1.0", + "axum", + "http", "indicatif", "lazy_static", "opentelemetry 0.24.0", @@ -5043,7 +4703,7 @@ dependencies = [ "reqwest-tracing", "thiserror", "tokio", - "tonic 0.12.2", + "tonic", "tracing", "tracing-indicatif", "tracing-opentelemetry 0.25.0", @@ -5426,31 +5086,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "which" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 9e6fba4cb..4fa06637c 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -1055,135 +1055,7 @@ rec { ]; }; - "axum 0.6.20" = rec { - crateName = "axum"; - version = "0.6.20"; - edition = "2021"; - sha256 = "1gynqkg3dcy1zd7il69h8a3zax86v6qq5zpawqyn87mr6979x0iv"; - dependencies = [ - { - name = "async-trait"; - packageId = "async-trait"; - } - { - name = "axum-core"; - packageId = "axum-core 0.3.4"; - } - { - name = "bitflags"; - packageId = "bitflags 1.3.2"; - } - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - features = [ "alloc" ]; - } - { - name = "http"; - packageId = "http 0.2.11"; - } - { - name = "http-body"; - packageId = "http-body 0.4.6"; - } - { - name = "hyper"; - packageId = "hyper 0.14.28"; - features = [ "stream" ]; - } - { - name = "itoa"; - packageId = "itoa"; - } - { - name = "matchit"; - packageId = "matchit 0.7.3"; - } - { - 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 = "sync_wrapper"; - packageId = "sync_wrapper 0.1.2"; - } - { - name = "tower"; - packageId = "tower"; - usesDefaultFeatures = false; - features = [ "util" ]; - } - { - name = "tower-layer"; - packageId = "tower-layer"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - ]; - buildDependencies = [ - { - name = "rustversion"; - packageId = "rustversion"; - } - ]; - devDependencies = [ - { - name = "rustversion"; - packageId = "rustversion"; - } - { - name = "serde"; - packageId = "serde"; - features = [ "derive" ]; - } - { - name = "tower"; - packageId = "tower"; - rename = "tower"; - features = [ "util" "timeout" "limit" "load-shed" "steer" "filter" ]; - } - ]; - features = { - "__private_docs" = [ "tower/full" "dep:tower-http" ]; - "default" = [ "form" "http1" "json" "matched-path" "original-uri" "query" "tokio" "tower-log" ]; - "form" = [ "dep:serde_urlencoded" ]; - "headers" = [ "dep:headers" ]; - "http1" = [ "hyper/http1" ]; - "http2" = [ "hyper/http2" ]; - "json" = [ "dep:serde_json" "dep:serde_path_to_error" ]; - "macros" = [ "dep:axum-macros" ]; - "multipart" = [ "dep:multer" ]; - "query" = [ "dep:serde_urlencoded" ]; - "tokio" = [ "dep:tokio" "hyper/server" "hyper/tcp" "hyper/runtime" "tower/make" ]; - "tower-log" = [ "tower/log" ]; - "tracing" = [ "dep:tracing" "axum-core/tracing" ]; - "ws" = [ "tokio" "dep:tokio-tungstenite" "dep:sha1" "dep:base64" ]; - }; - }; - "axum 0.7.5" = rec { + "axum" = rec { crateName = "axum"; version = "0.7.5"; edition = "2021"; @@ -1195,7 +1067,7 @@ rec { } { name = "axum-core"; - packageId = "axum-core 0.4.3"; + packageId = "axum-core"; } { name = "bytes"; @@ -1209,11 +1081,11 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "http-body-util"; @@ -1221,7 +1093,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; optional = true; } { @@ -1360,68 +1232,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "form" "http1" "http2" "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"; - sha256 = "0b1d9nkqb8znaba4qqzxzc968qwj4ybn4vgpyz9lz4a7l9vsb7vm"; - libName = "axum_core"; - 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 0.2.11"; - } - { - name = "http-body"; - packageId = "http-body 0.4.6"; - } - { - name = "mime"; - packageId = "mime"; - } - { - name = "tower-layer"; - packageId = "tower-layer"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - ]; - 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" ]; - }; - }; - "axum-core 0.4.3" = rec { + "axum-core" = rec { crateName = "axum-core"; version = "0.4.3"; edition = "2021"; @@ -1444,11 +1255,11 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "http-body-util"; @@ -1575,7 +1386,7 @@ rec { "default" = [ "std" ]; "std" = [ "alloc" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + resolvedDefaultFeatures = [ "alloc" "std" ]; }; "base64 0.22.1" = rec { crateName = "base64"; @@ -1608,7 +1419,12 @@ rec { crateName = "bigtable_rs"; version = "0.2.10"; edition = "2021"; - sha256 = "0wzcx254qlzy64306mg3ynp1izvn0wdii2gyn6raz0harl5bmk0j"; + workspace_member = null; + src = pkgs.fetchgit { + url = "https://github.com/liufuyang/bigtable_rs"; + rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef"; + sha256 = "0mn6iw1z7gdxbarsqiwscbdr25nplwlvzs0rs51vgnnjfsnbgl6q"; + }; authors = [ "Fuyang Liu " ]; @@ -1619,7 +1435,12 @@ rec { } { name = "http"; - packageId = "http 0.2.11"; + packageId = "http"; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "tokio" ]; } { name = "log"; @@ -1627,11 +1448,11 @@ rec { } { name = "prost"; - packageId = "prost 0.12.3"; + packageId = "prost"; } { name = "prost-types"; - packageId = "prost-types 0.12.3"; + packageId = "prost-types"; } { name = "prost-wkt"; @@ -1662,7 +1483,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.11.0"; + packageId = "tonic"; features = [ "tls" "transport" ]; } { @@ -1673,15 +1494,15 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build 0.12.3"; + packageId = "prost-build"; } { - name = "prost-wkt-build"; - packageId = "prost-wkt-build"; + name = "prost-wkt-types"; + packageId = "prost-wkt-types"; } { name = "tonic-build"; - packageId = "tonic-build 0.11.0"; + packageId = "tonic-build"; features = [ "cleanup-markdown" ]; } ]; @@ -3424,7 +3245,7 @@ rec { "default" = [ "use_std" ]; "serde" = [ "dep:serde" ]; }; - resolvedDefaultFeatures = [ "default" "use_std" ]; + resolvedDefaultFeatures = [ "use_std" ]; }; "encode_unicode" = rec { crateName = "encode_unicode"; @@ -4448,9 +4269,9 @@ rec { }; "gcp_auth" = rec { crateName = "gcp_auth"; - version = "0.10.0"; + version = "0.12.2"; edition = "2021"; - sha256 = "1m7lsh2gc7n9p0gs9k2qbxsrvchw1vz6dyz9a2ma322vd3m72b6y"; + sha256 = "0gb9bp9nkc810kfycm4vxndpccbhx68lcirq0y06lafykpkpjv2k"; dependencies = [ { name = "async-trait"; @@ -4458,7 +4279,11 @@ rec { } { name = "base64"; - packageId = "base64 0.21.7"; + packageId = "base64 0.22.1"; + } + { + name = "bytes"; + packageId = "bytes"; } { name = "chrono"; @@ -4469,28 +4294,38 @@ rec { name = "home"; packageId = "home"; } + { + name = "http"; + packageId = "http"; + } + { + name = "http-body-util"; + packageId = "http-body-util"; + } { name = "hyper"; - packageId = "hyper 0.14.28"; - features = [ "client" "runtime" "http2" ]; + packageId = "hyper"; + usesDefaultFeatures = false; + features = [ "client" "http1" "http2" ]; } { name = "hyper-rustls"; - packageId = "hyper-rustls 0.24.2"; + packageId = "hyper-rustls"; usesDefaultFeatures = false; - features = [ "tokio-runtime" "http1" "http2" ]; + features = [ "http1" "http2" ]; + } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "client-legacy" ]; } { name = "ring"; packageId = "ring"; } - { - name = "rustls"; - packageId = "rustls 0.21.12"; - } { name = "rustls-pemfile"; - packageId = "rustls-pemfile 1.0.4"; + packageId = "rustls-pemfile"; } { name = "serde"; @@ -4522,10 +4357,6 @@ rec { name = "url"; packageId = "url"; } - { - name = "which"; - packageId = "which 5.0.0"; - } ]; devDependencies = [ { @@ -4535,7 +4366,7 @@ rec { } ]; features = { - "default" = [ "hyper-rustls/rustls-native-certs" ]; + "default" = [ "hyper-rustls/rustls-native-certs" "hyper-rustls/ring" ]; "webpki-roots" = [ "hyper-rustls/webpki-roots" ]; }; resolvedDefaultFeatures = [ "default" ]; @@ -4719,79 +4550,7 @@ rec { ]; }; - "h2 0.3.26" = rec { - crateName = "h2"; - version = "0.3.26"; - edition = "2018"; - sha256 = "1s7msnfv7xprzs6xzfj5sg6p8bjcdpcqcmjjbkd345cyi1x55zl1"; - 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 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.4" = rec { + "h2" = rec { crateName = "h2"; version = "0.4.4"; edition = "2021"; @@ -4826,7 +4585,7 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "indexmap"; @@ -5016,33 +4775,7 @@ rec { ]; }; - "http 0.2.11" = rec { - crateName = "http"; - version = "0.2.11"; - edition = "2018"; - sha256 = "1fwz3mhh86h5kfnr5767jlx9agpdggclq7xsqx930fflzakb2iw9"; - authors = [ - "Alex Crichton " - "Carl Lerche " - "Sean McArthur " - ]; - dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "fnv"; - packageId = "fnv"; - } - { - name = "itoa"; - packageId = "itoa"; - } - ]; - - }; - "http 1.1.0" = rec { + "http" = rec { crateName = "http"; version = "1.1.0"; edition = "2018"; @@ -5071,34 +4804,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "http-body 0.4.6" = rec { - crateName = "http-body"; - version = "0.4.6"; - edition = "2018"; - sha256 = "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw"; - libName = "http_body"; - authors = [ - "Carl Lerche " - "Lucio Franco " - "Sean McArthur " - ]; - dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "http"; - packageId = "http 0.2.11"; - } - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - ]; - - }; - "http-body 1.0.0" = rec { + "http-body" = rec { crateName = "http-body"; version = "1.0.0"; edition = "2018"; @@ -5116,7 +4822,7 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } ]; @@ -5143,11 +4849,11 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "pin-project-lite"; @@ -5189,114 +4895,7 @@ rec { ]; }; - "hyper 0.14.28" = rec { - crateName = "hyper"; - version = "0.14.28"; - edition = "2018"; - sha256 = "107gkvqx4h9bl17d602zkm2dgpfq86l2dr36yzfsi8l3xcsy35mz"; - authors = [ - "Sean McArthur " - ]; - dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "futures-channel"; - packageId = "futures-channel"; - } - { - name = "futures-core"; - packageId = "futures-core"; - usesDefaultFeatures = false; - } - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } - { - name = "h2"; - packageId = "h2 0.3.26"; - optional = true; - } - { - name = "http"; - packageId = "http 0.2.11"; - } - { - name = "http-body"; - packageId = "http-body 0.4.6"; - } - { - name = "httparse"; - packageId = "httparse"; - } - { - name = "httpdate"; - packageId = "httpdate"; - } - { - name = "itoa"; - packageId = "itoa"; - } - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - { - name = "socket2"; - packageId = "socket2"; - optional = true; - features = [ "all" ]; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "sync" ]; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - usesDefaultFeatures = false; - features = [ "std" ]; - } - { - name = "want"; - packageId = "want"; - } - ]; - devDependencies = [ - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - features = [ "alloc" ]; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "fs" "macros" "io-std" "io-util" "rt" "rt-multi-thread" "sync" "time" "test-util" ]; - } - ]; - features = { - "ffi" = [ "libc" ]; - "full" = [ "client" "http1" "http2" "server" "stream" "runtime" ]; - "h2" = [ "dep:h2" ]; - "http2" = [ "h2" ]; - "libc" = [ "dep:libc" ]; - "runtime" = [ "tcp" "tokio/rt" "tokio/time" ]; - "socket2" = [ "dep:socket2" ]; - "tcp" = [ "socket2" "tokio/net" "tokio/rt" "tokio/time" ]; - }; - resolvedDefaultFeatures = [ "client" "default" "full" "h2" "http1" "http2" "runtime" "server" "socket2" "stream" "tcp" ]; - }; - "hyper 1.4.1" = rec { + "hyper" = rec { crateName = "hyper"; version = "1.4.1"; edition = "2021"; @@ -5322,16 +4921,16 @@ rec { } { name = "h2"; - packageId = "h2 0.4.4"; + packageId = "h2"; optional = true; } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "httparse"; @@ -5399,83 +4998,7 @@ rec { }; resolvedDefaultFeatures = [ "client" "default" "http1" "http2" "server" ]; }; - "hyper-rustls 0.24.2" = rec { - crateName = "hyper-rustls"; - version = "0.24.2"; - edition = "2021"; - sha256 = "1475j4a2nczz4aajzzsq3hpwg1zacmzbqg393a14j80ff8izsgpc"; - libName = "hyper_rustls"; - dependencies = [ - { - name = "futures-util"; - packageId = "futures-util"; - usesDefaultFeatures = false; - } - { - name = "http"; - packageId = "http 0.2.11"; - } - { - name = "hyper"; - packageId = "hyper 0.14.28"; - usesDefaultFeatures = false; - features = [ "client" ]; - } - { - name = "rustls"; - packageId = "rustls 0.21.12"; - usesDefaultFeatures = false; - } - { - name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.6.3"; - optional = true; - } - { - name = "tokio"; - packageId = "tokio"; - } - { - name = "tokio-rustls"; - packageId = "tokio-rustls 0.24.1"; - usesDefaultFeatures = false; - } - ]; - devDependencies = [ - { - name = "hyper"; - packageId = "hyper 0.14.28"; - features = [ "full" ]; - } - { - name = "rustls"; - packageId = "rustls 0.21.12"; - usesDefaultFeatures = false; - features = [ "tls12" ]; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "io-std" "macros" "net" "rt-multi-thread" ]; - } - ]; - features = { - "acceptor" = [ "hyper/server" "tokio-runtime" ]; - "default" = [ "native-tokio" "http1" "tls12" "logging" "acceptor" ]; - "http1" = [ "hyper/http1" ]; - "http2" = [ "hyper/http2" ]; - "log" = [ "dep:log" ]; - "logging" = [ "log" "tokio-rustls/logging" "rustls/logging" ]; - "native-tokio" = [ "tokio-runtime" "rustls-native-certs" ]; - "rustls-native-certs" = [ "dep:rustls-native-certs" ]; - "tls12" = [ "tokio-rustls/tls12" "rustls/tls12" ]; - "tokio-runtime" = [ "hyper/runtime" ]; - "webpki-roots" = [ "dep:webpki-roots" ]; - "webpki-tokio" = [ "tokio-runtime" "webpki-roots" ]; - }; - resolvedDefaultFeatures = [ "http1" "http2" "rustls-native-certs" "tokio-runtime" ]; - }; - "hyper-rustls 0.27.2" = rec { + "hyper-rustls" = rec { crateName = "hyper-rustls"; version = "0.27.2"; edition = "2021"; @@ -5489,11 +5012,11 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; usesDefaultFeatures = false; } { @@ -5504,12 +5027,12 @@ rec { } { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; usesDefaultFeatures = false; } { name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.7.0"; + packageId = "rustls-native-certs"; optional = true; } { @@ -5523,7 +5046,7 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls 0.26.0"; + packageId = "tokio-rustls"; usesDefaultFeatures = false; } { @@ -5540,7 +5063,7 @@ rec { } { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; usesDefaultFeatures = false; features = [ "tls12" ]; } @@ -5568,49 +5091,7 @@ rec { }; resolvedDefaultFeatures = [ "http1" "http2" "native-tokio" "ring" "rustls-native-certs" "tls12" ]; }; - "hyper-timeout 0.4.1" = rec { - crateName = "hyper-timeout"; - version = "0.4.1"; - edition = "2018"; - sha256 = "1c8k3g8k2yh1gxvsx9p7amkimgxhl9kafwpj7jyf8ywc5r45ifdv"; - libName = "hyper_timeout"; - 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-timeout 0.5.1" = rec { + "hyper-timeout" = rec { crateName = "hyper-timeout"; version = "0.5.1"; edition = "2018"; @@ -5622,7 +5103,7 @@ rec { dependencies = [ { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; } { name = "hyper-util"; @@ -5645,7 +5126,7 @@ rec { devDependencies = [ { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; features = [ "http1" ]; } { @@ -5682,15 +5163,15 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; } { name = "pin-project-lite"; @@ -5735,7 +5216,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; features = [ "full" ]; } { @@ -6086,27 +5567,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "use_alloc" "use_std" ]; }; - "itertools 0.11.0" = rec { - crateName = "itertools"; - version = "0.11.0"; - edition = "2018"; - sha256 = "0mzyqcc59azx9g5cg6fs8k529gvh4463smmka6jvzs3cd2jp7hdi"; - authors = [ - "bluss" - ]; - dependencies = [ - { - name = "either"; - packageId = "either"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "use_std" ]; - "use_std" = [ "use_alloc" "either/use_std" ]; - }; - resolvedDefaultFeatures = [ "use_alloc" ]; - }; "itertools 0.12.0" = rec { crateName = "itertools"; version = "0.12.0"; @@ -7036,7 +6496,7 @@ rec { dependencies = [ { name = "axum"; - packageId = "axum 0.7.5"; + packageId = "axum"; features = [ "http2" ]; } { @@ -7079,7 +6539,7 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; } { name = "serde"; @@ -7106,7 +6566,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; features = [ "tls" "tls-roots" ]; } { @@ -7147,11 +6607,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build 0.13.1"; + packageId = "prost-build"; } { name = "tonic-build"; - packageId = "tonic-build 0.12.2"; + packageId = "tonic-build"; } ]; devDependencies = [ @@ -7851,7 +7311,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; optional = true; usesDefaultFeatures = false; } @@ -7902,7 +7362,7 @@ rec { } { name = "rustls-pemfile"; - packageId = "rustls-pemfile 2.1.0"; + packageId = "rustls-pemfile"; optional = true; usesDefaultFeatures = false; features = [ "std" ]; @@ -7945,7 +7405,7 @@ rec { devDependencies = [ { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; features = [ "server" ]; } { @@ -8120,7 +7580,7 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; usesDefaultFeatures = false; features = [ "std" ]; } @@ -8154,7 +7614,7 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; optional = true; usesDefaultFeatures = false; features = [ "std" ]; @@ -8176,7 +7636,7 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; optional = true; } { @@ -8193,7 +7653,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; optional = true; usesDefaultFeatures = false; } @@ -8254,12 +7714,12 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; optional = true; } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; optional = true; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; @@ -9253,35 +8713,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "lazy_static" "regex-syntax" "std" "tempfile" ]; }; - "prost 0.12.3" = rec { - crateName = "prost"; - version = "0.12.3"; - edition = "2021"; - sha256 = "0jmrhlb4jkiylz72xb14vlkfbmlq0jwv7j20ini9harhvaf2hv0l"; - authors = [ - "Dan Burkert " - "Lucio Franco " - ]; - dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - usesDefaultFeatures = false; - } - { - name = "prost-derive"; - packageId = "prost-derive 0.12.3"; - optional = true; - } - ]; - features = { - "default" = [ "prost-derive" "std" ]; - "prost-derive" = [ "dep:prost-derive" ]; - }; - resolvedDefaultFeatures = [ "default" "prost-derive" "std" ]; - }; - "prost 0.13.1" = rec { + "prost" = rec { crateName = "prost"; version = "0.13.1"; edition = "2021"; @@ -9300,7 +8732,7 @@ rec { } { name = "prost-derive"; - packageId = "prost-derive 0.13.1"; + packageId = "prost-derive"; optional = true; } ]; @@ -9311,110 +8743,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "derive" "prost-derive" "std" ]; }; - "prost-build 0.12.3" = rec { - crateName = "prost-build"; - version = "0.12.3"; - edition = "2021"; - sha256 = "1lp2l1l65l163yggk9nw5mjb2fqwzz12693af5phn1v0abih4pn5"; - libName = "prost_build"; - authors = [ - "Dan Burkert " - "Lucio Franco " - "Tokio Contributors " - ]; - dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - usesDefaultFeatures = false; - } - { - name = "heck"; - packageId = "heck"; - } - { - name = "itertools"; - packageId = "itertools 0.11.0"; - usesDefaultFeatures = false; - features = [ "use_alloc" ]; - } - { - name = "log"; - packageId = "log"; - } - { - name = "multimap"; - packageId = "multimap"; - usesDefaultFeatures = false; - } - { - name = "once_cell"; - packageId = "once_cell"; - } - { - name = "petgraph"; - packageId = "petgraph"; - usesDefaultFeatures = false; - } - { - name = "prettyplease"; - packageId = "prettyplease"; - optional = true; - } - { - name = "prost"; - packageId = "prost 0.12.3"; - usesDefaultFeatures = false; - } - { - name = "prost-types"; - packageId = "prost-types 0.12.3"; - usesDefaultFeatures = false; - } - { - name = "pulldown-cmark"; - packageId = "pulldown-cmark"; - optional = true; - usesDefaultFeatures = false; - } - { - name = "pulldown-cmark-to-cmark"; - packageId = "pulldown-cmark-to-cmark"; - optional = true; - } - { - name = "regex"; - packageId = "regex"; - usesDefaultFeatures = false; - features = [ "std" "unicode-bool" ]; - } - { - name = "syn"; - packageId = "syn 2.0.72"; - optional = true; - features = [ "full" ]; - } - { - name = "tempfile"; - packageId = "tempfile"; - } - { - name = "which"; - packageId = "which 4.4.2"; - } - ]; - features = { - "cleanup-markdown" = [ "pulldown-cmark" "pulldown-cmark-to-cmark" ]; - "default" = [ "format" ]; - "format" = [ "prettyplease" "syn" ]; - "prettyplease" = [ "dep:prettyplease" ]; - "pulldown-cmark" = [ "dep:pulldown-cmark" ]; - "pulldown-cmark-to-cmark" = [ "dep:pulldown-cmark-to-cmark" ]; - "syn" = [ "dep:syn" ]; - }; - resolvedDefaultFeatures = [ "cleanup-markdown" "default" "format" "prettyplease" "pulldown-cmark" "pulldown-cmark-to-cmark" "syn" ]; - }; - "prost-build 0.13.1" = rec { + "prost-build" = rec { crateName = "prost-build"; version = "0.13.1"; edition = "2021"; @@ -9467,14 +8796,25 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; usesDefaultFeatures = false; } { name = "prost-types"; - packageId = "prost-types 0.13.1"; + packageId = "prost-types"; usesDefaultFeatures = false; } + { + name = "pulldown-cmark"; + packageId = "pulldown-cmark"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "pulldown-cmark-to-cmark"; + packageId = "pulldown-cmark-to-cmark"; + optional = true; + } { name = "regex"; packageId = "regex"; @@ -9497,48 +8837,9 @@ rec { "default" = [ "format" ]; "format" = [ "dep:prettyplease" "dep:syn" ]; }; - resolvedDefaultFeatures = [ "default" "format" ]; + resolvedDefaultFeatures = [ "cleanup-markdown" "default" "format" ]; }; - "prost-derive 0.12.3" = rec { - crateName = "prost-derive"; - version = "0.12.3"; - edition = "2021"; - sha256 = "03l4yf6pdjvc4sgbvln2srq1avzm1ai86zni4hhqxvqxvnhwkdpg"; - procMacro = true; - libName = "prost_derive"; - authors = [ - "Dan Burkert " - "Lucio Franco " - "Tokio Contributors " - ]; - dependencies = [ - { - name = "anyhow"; - packageId = "anyhow"; - } - { - name = "itertools"; - packageId = "itertools 0.11.0"; - usesDefaultFeatures = false; - features = [ "use_alloc" ]; - } - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 2.0.72"; - features = [ "extra-traits" ]; - } - ]; - - }; - "prost-derive 0.13.1" = rec { + "prost-derive" = rec { crateName = "prost-derive"; version = "0.13.1"; edition = "2021"; @@ -9576,32 +8877,7 @@ rec { ]; }; - "prost-types 0.12.3" = rec { - crateName = "prost-types"; - version = "0.12.3"; - edition = "2021"; - sha256 = "03j73llzljdxv9cdxp4m3vb9j3gh4y24rkbx48k3rx6wkvsrhf0r"; - libName = "prost_types"; - authors = [ - "Dan Burkert " - "Lucio Franco " - ]; - dependencies = [ - { - name = "prost"; - packageId = "prost 0.12.3"; - usesDefaultFeatures = false; - features = [ "prost-derive" ]; - } - ]; - features = { - "default" = [ "std" ]; - "std" = [ "prost/std" ]; - }; - resolvedDefaultFeatures = [ "default" "std" ]; - }; - "prost-types 0.13.1" = rec { + "prost-types" = rec { crateName = "prost-types"; version = "0.13.1"; edition = "2021"; @@ -9616,7 +8892,7 @@ rec { dependencies = [ { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; usesDefaultFeatures = false; features = [ "prost-derive" ]; } @@ -9629,9 +8905,9 @@ rec { }; "prost-wkt" = rec { crateName = "prost-wkt"; - version = "0.5.0"; + version = "0.6.0"; edition = "2021"; - sha256 = "0h3c0jyfpg7f3s9a3mx6xcif28j3ir5c5qmps88bknpiy31zk3jd"; + sha256 = "16c2mbaq2hff51kwr204fncnmi0qx2zz4ff3pb1086qqxqmlxn58"; libName = "prost_wkt"; authors = [ "fdeantoni " @@ -9649,7 +8925,7 @@ rec { } { name = "prost"; - packageId = "prost 0.12.3"; + packageId = "prost"; } { name = "serde"; @@ -9672,9 +8948,9 @@ rec { }; "prost-wkt-build" = rec { crateName = "prost-wkt-build"; - version = "0.5.0"; + version = "0.6.0"; edition = "2021"; - sha256 = "0883g26vrhx07kv0dq85559pj95zxs10lx042pp4za2clplwlcav"; + sha256 = "054v5qqvdv29g5s1kr26zv0yvzc8gmnlx9k2dw6026g7rdd9srla"; libName = "prost_wkt_build"; authors = [ "fdeantoni " @@ -9686,15 +8962,15 @@ rec { } { name = "prost"; - packageId = "prost 0.12.3"; + packageId = "prost"; } { name = "prost-build"; - packageId = "prost-build 0.12.3"; + packageId = "prost-build"; } { name = "prost-types"; - packageId = "prost-types 0.12.3"; + packageId = "prost-types"; } { name = "quote"; @@ -9705,9 +8981,9 @@ rec { }; "prost-wkt-types" = rec { crateName = "prost-wkt-types"; - version = "0.5.0"; + version = "0.6.0"; edition = "2021"; - sha256 = "1vipmgvqqzr3hn9z5v85mx9zznzjwyfpjy8xzg2v94a0f2lf8ns3"; + sha256 = "0r2gxf5b604b00v1fwif1rn5nm5xk4vb3ri29dhm9rl2kf70dvq1"; libName = "prost_wkt_types"; authors = [ "fdeantoni " @@ -9721,7 +8997,7 @@ rec { } { name = "prost"; - packageId = "prost 0.12.3"; + packageId = "prost"; } { name = "prost-wkt"; @@ -9743,15 +9019,15 @@ rec { buildDependencies = [ { name = "prost"; - packageId = "prost 0.12.3"; + packageId = "prost"; } { name = "prost-build"; - packageId = "prost-build 0.12.3"; + packageId = "prost-build"; } { name = "prost-types"; - packageId = "prost-types 0.12.3"; + packageId = "prost-types"; } { name = "prost-wkt-build"; @@ -9885,7 +9161,7 @@ rec { } { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; optional = true; usesDefaultFeatures = false; features = [ "ring" "std" ]; @@ -9953,7 +9229,7 @@ rec { } { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; optional = true; usesDefaultFeatures = false; features = [ "ring" "std" ]; @@ -10570,17 +9846,17 @@ rec { } { name = "h2"; - packageId = "h2 0.4.4"; + packageId = "h2"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; target = { target, features }: (!("wasm32" == target."arch" or null)); } { @@ -10590,13 +9866,13 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "http1" "client" ]; } { name = "hyper-rustls"; - packageId = "hyper-rustls 0.27.2"; + packageId = "hyper-rustls"; optional = true; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); @@ -10653,7 +9929,7 @@ rec { } { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; optional = true; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); @@ -10661,13 +9937,13 @@ rec { } { name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.7.0"; + packageId = "rustls-native-certs"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } { name = "rustls-pemfile"; - packageId = "rustls-pemfile 2.1.0"; + packageId = "rustls-pemfile"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } @@ -10709,7 +9985,7 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls 0.26.0"; + packageId = "tokio-rustls"; optional = true; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); @@ -10769,7 +10045,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "http1" "http2" "client" "server" ]; @@ -10782,7 +10058,7 @@ rec { } { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "ring" ]; @@ -10861,7 +10137,7 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "reqwest"; @@ -10915,7 +10191,7 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "matchit"; @@ -11377,104 +10653,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "event" "fs" "net" "pipe" "process" "std" "termios" "time" "use-libc-auxv" ]; }; - "rustls 0.21.12" = rec { - crateName = "rustls"; - version = "0.21.12"; - edition = "2021"; - sha256 = "0gjdg2a9r81sdwkyw3n5yfbkrr6p9gyk3xr2kcsr3cs83x6s2miz"; - dependencies = [ - { - name = "log"; - packageId = "log"; - optional = true; - } - { - name = "ring"; - packageId = "ring"; - } - { - name = "rustls-webpki"; - packageId = "rustls-webpki 0.101.7"; - rename = "webpki"; - features = [ "alloc" "std" ]; - } - { - name = "sct"; - packageId = "sct"; - } - ]; - devDependencies = [ - { - name = "log"; - packageId = "log"; - } - ]; - features = { - "default" = [ "logging" "tls12" ]; - "log" = [ "dep:log" ]; - "logging" = [ "log" ]; - "read_buf" = [ "rustversion" ]; - "rustversion" = [ "dep:rustversion" ]; - }; - resolvedDefaultFeatures = [ "default" "log" "logging" "tls12" ]; - }; - "rustls 0.22.4" = rec { - crateName = "rustls"; - version = "0.22.4"; - edition = "2021"; - sha256 = "0cl4q6w0x1cl5ldjsgbbiiqhkz6qg5vxl5dkn9wwsyxc44vzfkmz"; - 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 0.23.7" = rec { + "rustls" = rec { crateName = "rustls"; version = "0.23.7"; edition = "2021"; @@ -11504,7 +10683,7 @@ rec { } { name = "rustls-webpki"; - packageId = "rustls-webpki 0.102.2"; + packageId = "rustls-webpki"; rename = "webpki"; usesDefaultFeatures = false; features = [ "alloc" ]; @@ -11540,36 +10719,7 @@ rec { }; resolvedDefaultFeatures = [ "log" "logging" "ring" "std" "tls12" ]; }; - "rustls-native-certs 0.6.3" = rec { - crateName = "rustls-native-certs"; - version = "0.6.3"; - edition = "2021"; - sha256 = "007zind70rd5rfsrkdcfm8vn09j8sg02phg9334kark6rdscxam9"; - libName = "rustls_native_certs"; - 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 1.0.4"; - } - { - 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-native-certs 0.7.0" = rec { + "rustls-native-certs" = rec { crateName = "rustls-native-certs"; version = "0.7.0"; edition = "2021"; @@ -11583,7 +10733,7 @@ rec { } { name = "rustls-pemfile"; - packageId = "rustls-pemfile 2.1.0"; + packageId = "rustls-pemfile"; } { name = "rustls-pki-types"; @@ -11603,21 +10753,7 @@ rec { ]; }; - "rustls-pemfile 1.0.4" = rec { - crateName = "rustls-pemfile"; - version = "1.0.4"; - edition = "2018"; - sha256 = "1324n5bcns0rnw6vywr5agff3rwfvzphi7rmbyzwnv6glkhclx0w"; - libName = "rustls_pemfile"; - dependencies = [ - { - name = "base64"; - packageId = "base64 0.21.7"; - } - ]; - - }; - "rustls-pemfile 2.1.0" = rec { + "rustls-pemfile" = rec { crateName = "rustls-pemfile"; version = "2.1.0"; edition = "2018"; @@ -11654,31 +10790,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; - "rustls-webpki 0.101.7" = rec { - crateName = "rustls-webpki"; - version = "0.101.7"; - edition = "2021"; - sha256 = "0rapfhpkqp75552i8r0y7f4vq7csb4k7gjjans0df73sxv8paqlb"; - libName = "webpki"; - dependencies = [ - { - name = "ring"; - packageId = "ring"; - usesDefaultFeatures = false; - } - { - name = "untrusted"; - packageId = "untrusted"; - } - ]; - features = { - "alloc" = [ "ring/alloc" ]; - "default" = [ "std" ]; - "std" = [ "alloc" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; - }; - "rustls-webpki 0.102.2" = rec { + "rustls-webpki" = rec { crateName = "rustls-webpki"; version = "0.102.2"; edition = "2021"; @@ -11896,26 +11008,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "use_std" ]; }; - "sct" = rec { - crateName = "sct"; - version = "0.7.1"; - edition = "2021"; - sha256 = "056lmi2xkzdg1dbai6ha3n57s18cbip4pnmpdhyljli3m99n216s"; - authors = [ - "Joseph Birr-Pixton " - ]; - dependencies = [ - { - name = "ring"; - packageId = "ring"; - } - { - name = "untrusted"; - packageId = "untrusted"; - } - ]; - - }; "security-framework" = rec { crateName = "security-framework"; version = "2.9.2"; @@ -13492,35 +12584,6 @@ rec { }; resolvedDefaultFeatures = [ "bytes" "default" "fs" "io-std" "io-util" "libc" "macros" "mio" "net" "num_cpus" "rt" "rt-multi-thread" "signal" "signal-hook-registry" "socket2" "sync" "test-util" "time" "tokio-macros" "windows-sys" ]; }; - "tokio-io-timeout" = rec { - crateName = "tokio-io-timeout"; - version = "1.2.0"; - edition = "2018"; - sha256 = "1gx84f92q1491vj4pkn81j8pz1s3pgwnbrsdhfsa2556mli41drh"; - libName = "tokio_io_timeout"; - authors = [ - "Steven Fackler " - ]; - dependencies = [ - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "time" ]; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "full" ]; - } - ]; - - }; "tokio-listener" = rec { crateName = "tokio-listener"; version = "0.4.3"; @@ -13530,7 +12593,7 @@ rec { dependencies = [ { name = "axum"; - packageId = "axum 0.7.5"; + packageId = "axum"; rename = "axum07"; optional = true; } @@ -13556,7 +12619,7 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; rename = "hyper1"; optional = true; features = [ "server" ]; @@ -13598,7 +12661,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; rename = "tonic_012"; optional = true; } @@ -13712,76 +12775,7 @@ rec { ]; }; - "tokio-rustls 0.24.1" = rec { - crateName = "tokio-rustls"; - version = "0.24.1"; - edition = "2018"; - sha256 = "10bhibg57mqir7xjhb2xmf24xgfpx6fzpyw720a4ih8a737jg0y2"; - libName = "tokio_rustls"; - dependencies = [ - { - name = "rustls"; - packageId = "rustls 0.21.12"; - usesDefaultFeatures = false; - } - { - name = "tokio"; - packageId = "tokio"; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "full" ]; - } - ]; - features = { - "dangerous_configuration" = [ "rustls/dangerous_configuration" ]; - "default" = [ "logging" "tls12" ]; - "logging" = [ "rustls/logging" ]; - "secret_extraction" = [ "rustls/secret_extraction" ]; - "tls12" = [ "rustls/tls12" ]; - }; - }; - "tokio-rustls 0.25.0" = rec { - crateName = "tokio-rustls"; - version = "0.25.0"; - edition = "2021"; - sha256 = "03w6d5aqqf084rmcmrsyq5grhydl53blaiqcl0i2yfnv187hqpkp"; - libName = "tokio_rustls"; - dependencies = [ - { - name = "rustls"; - packageId = "rustls 0.22.4"; - 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-rustls 0.26.0" = rec { + "tokio-rustls" = rec { crateName = "tokio-rustls"; version = "0.26.0"; edition = "2021"; @@ -13790,7 +12784,7 @@ rec { dependencies = [ { name = "rustls"; - packageId = "rustls 0.23.7"; + packageId = "rustls"; usesDefaultFeatures = false; features = [ "std" ]; } @@ -14253,148 +13247,7 @@ rec { }; resolvedDefaultFeatures = [ "display" "parse" "serde" ]; }; - "tonic 0.11.0" = rec { - crateName = "tonic"; - version = "0.11.0"; - edition = "2021"; - sha256 = "04qsr527i256i3dk9dp1g2jr42q7yl91y5h06rvd9ycy9rxfpi3n"; - authors = [ - "Lucio Franco " - ]; - dependencies = [ - { - name = "async-stream"; - packageId = "async-stream"; - optional = true; - } - { - name = "async-trait"; - packageId = "async-trait"; - optional = true; - } - { - name = "axum"; - packageId = "axum 0.6.20"; - optional = true; - usesDefaultFeatures = false; - } - { - name = "base64"; - packageId = "base64 0.21.7"; - } - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "h2"; - packageId = "h2 0.3.26"; - optional = true; - } - { - name = "http"; - packageId = "http 0.2.11"; - } - { - name = "http-body"; - packageId = "http-body 0.4.6"; - } - { - name = "hyper"; - packageId = "hyper 0.14.28"; - optional = true; - features = [ "full" ]; - } - { - name = "hyper-timeout"; - packageId = "hyper-timeout 0.4.1"; - optional = true; - } - { - name = "percent-encoding"; - packageId = "percent-encoding"; - } - { - name = "pin-project"; - packageId = "pin-project"; - } - { - name = "prost"; - packageId = "prost 0.12.3"; - optional = true; - usesDefaultFeatures = false; - features = [ "std" ]; - } - { - name = "rustls-pemfile"; - packageId = "rustls-pemfile 2.1.0"; - optional = true; - } - { - name = "rustls-pki-types"; - packageId = "rustls-pki-types"; - optional = true; - } - { - name = "tokio"; - packageId = "tokio"; - } - { - name = "tokio-rustls"; - packageId = "tokio-rustls 0.25.0"; - optional = true; - } - { - name = "tokio-stream"; - packageId = "tokio-stream"; - } - { - name = "tower"; - packageId = "tower"; - optional = true; - usesDefaultFeatures = false; - features = [ "balance" "buffer" "discover" "limit" "load" "make" "timeout" "util" ]; - } - { - name = "tower-layer"; - packageId = "tower-layer"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "rt" "macros" ]; - } - { - name = "tower"; - packageId = "tower"; - features = [ "full" ]; - } - ]; - features = { - "codegen" = [ "dep:async-trait" ]; - "default" = [ "transport" "codegen" "prost" ]; - "gzip" = [ "dep:flate2" ]; - "prost" = [ "dep:prost" ]; - "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" "transport" ]; - }; - "tonic 0.12.2" = rec { + "tonic" = rec { crateName = "tonic"; version = "0.12.2"; edition = "2021"; @@ -14415,7 +13268,7 @@ rec { } { name = "axum"; - packageId = "axum 0.7.5"; + packageId = "axum"; optional = true; usesDefaultFeatures = false; } @@ -14429,16 +13282,16 @@ rec { } { name = "h2"; - packageId = "h2 0.4.4"; + packageId = "h2"; optional = true; } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "http-body-util"; @@ -14446,13 +13299,13 @@ rec { } { name = "hyper"; - packageId = "hyper 1.4.1"; + packageId = "hyper"; optional = true; features = [ "http1" "http2" ]; } { name = "hyper-timeout"; - packageId = "hyper-timeout 0.5.1"; + packageId = "hyper-timeout"; optional = true; } { @@ -14471,19 +13324,19 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; optional = true; usesDefaultFeatures = false; features = [ "std" ]; } { name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.7.0"; + packageId = "rustls-native-certs"; optional = true; } { name = "rustls-pemfile"; - packageId = "rustls-pemfile 2.1.0"; + packageId = "rustls-pemfile"; optional = true; } { @@ -14500,7 +13353,7 @@ rec { } { name = "tokio-rustls"; - packageId = "tokio-rustls 0.26.0"; + packageId = "tokio-rustls"; optional = true; usesDefaultFeatures = false; features = [ "logging" "tls12" "ring" ]; @@ -14558,47 +13411,7 @@ rec { }; resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "router" "server" "tls" "tls-native-roots" "tls-roots" "transport" ]; }; - "tonic-build 0.11.0" = rec { - crateName = "tonic-build"; - version = "0.11.0"; - edition = "2021"; - sha256 = "1hm99ckaw0pzq8h22bdjy6gpbg06kpvs0f73nj60f456f3fzckmy"; - libName = "tonic_build"; - authors = [ - "Lucio Franco " - ]; - dependencies = [ - { - name = "prettyplease"; - packageId = "prettyplease"; - } - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "prost-build"; - packageId = "prost-build 0.12.3"; - optional = true; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 2.0.72"; - } - ]; - features = { - "cleanup-markdown" = [ "prost" "prost-build/cleanup-markdown" ]; - "default" = [ "transport" "prost" ]; - "prost" = [ "prost-build" ]; - "prost-build" = [ "dep:prost-build" ]; - }; - resolvedDefaultFeatures = [ "cleanup-markdown" "default" "prost" "prost-build" "transport" ]; - }; - "tonic-build 0.12.2" = rec { + "tonic-build" = rec { crateName = "tonic-build"; version = "0.12.2"; edition = "2021"; @@ -14618,7 +13431,7 @@ rec { } { name = "prost-build"; - packageId = "prost-build 0.13.1"; + packageId = "prost-build"; optional = true; } { @@ -14636,7 +13449,7 @@ rec { "prost" = [ "prost-build" ]; "prost-build" = [ "dep:prost-build" ]; }; - resolvedDefaultFeatures = [ "default" "prost" "prost-build" "transport" ]; + resolvedDefaultFeatures = [ "cleanup-markdown" "default" "prost" "prost-build" "transport" ]; }; "tonic-health" = rec { crateName = "tonic-health"; @@ -14654,7 +13467,7 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; } { name = "tokio"; @@ -14667,7 +13480,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } @@ -14700,11 +13513,11 @@ rec { dependencies = [ { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; } { name = "prost-types"; - packageId = "prost-types 0.13.1"; + packageId = "prost-types"; optional = true; } { @@ -14721,7 +13534,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } @@ -14729,7 +13542,7 @@ rec { devDependencies = [ { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; usesDefaultFeatures = false; features = [ "transport" ]; } @@ -14860,7 +13673,7 @@ rec { "tracing" = [ "dep:tracing" ]; "util" = [ "__common" "futures-util" "pin-project" ]; }; - resolvedDefaultFeatures = [ "__common" "balance" "buffer" "default" "discover" "futures-core" "futures-util" "indexmap" "limit" "load" "log" "make" "pin-project" "pin-project-lite" "rand" "ready-cache" "slab" "timeout" "tokio" "tokio-util" "tracing" "util" ]; + resolvedDefaultFeatures = [ "__common" "balance" "buffer" "default" "discover" "futures-core" "futures-util" "indexmap" "limit" "load" "log" "make" "pin-project" "pin-project-lite" "rand" "ready-cache" "slab" "tokio" "tokio-util" "tracing" "util" ]; }; "tower-http" = rec { crateName = "tower-http"; @@ -14882,11 +13695,11 @@ rec { } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; } { name = "http-body"; - packageId = "http-body 1.0.0"; + packageId = "http-body"; } { name = "http-body-util"; @@ -15696,7 +14509,7 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; } { name = "thiserror"; @@ -15713,7 +14526,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; features = [ "tls" "tls-roots" ]; } { @@ -15741,11 +14554,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build 0.13.1"; + packageId = "prost-build"; } { name = "tonic-build"; - packageId = "tonic-build 0.12.2"; + packageId = "tonic-build"; } ]; devDependencies = [ @@ -15855,7 +14668,7 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; } { name = "redb"; @@ -15912,7 +14725,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; } { name = "tonic-reflection"; @@ -15982,11 +14795,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build 0.13.1"; + packageId = "prost-build"; } { name = "tonic-build"; - packageId = "tonic-build 0.12.2"; + packageId = "tonic-build"; } ]; devDependencies = [ @@ -16639,7 +15452,7 @@ rec { } { name = "prost"; - packageId = "prost 0.13.1"; + packageId = "prost"; } { name = "redb"; @@ -16711,7 +15524,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; features = [ "tls" "tls-roots" ]; } { @@ -16762,11 +15575,11 @@ rec { buildDependencies = [ { name = "prost-build"; - packageId = "prost-build 0.13.1"; + packageId = "prost-build"; } { name = "tonic-build"; - packageId = "tonic-build 0.12.2"; + packageId = "tonic-build"; } ]; devDependencies = [ @@ -16813,12 +15626,12 @@ rec { dependencies = [ { name = "axum"; - packageId = "axum 0.7.5"; + packageId = "axum"; optional = true; } { name = "http"; - packageId = "http 1.1.0"; + packageId = "http"; optional = true; } { @@ -16867,7 +15680,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.2"; + packageId = "tonic"; optional = true; } { @@ -18326,80 +17139,6 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "which 4.4.2" = rec { - crateName = "which"; - version = "4.4.2"; - edition = "2021"; - sha256 = "1ixzmx3svsv5hbdvd8vdhd3qwvf6ns8jdpif1wmwsy10k90j9fl7"; - authors = [ - "Harry Fei " - ]; - dependencies = [ - { - name = "either"; - packageId = "either"; - } - { - name = "home"; - packageId = "home"; - target = { target, features }: ((target."windows" or false) || (target."unix" or false) || ("redox" == target."os" or null)); - } - { - name = "once_cell"; - packageId = "once_cell"; - target = { target, features }: (target."windows" or false); - } - { - name = "rustix"; - packageId = "rustix"; - usesDefaultFeatures = false; - features = [ "fs" "std" ]; - } - ]; - features = { - "regex" = [ "dep:regex" ]; - }; - }; - "which 5.0.0" = rec { - crateName = "which"; - version = "5.0.0"; - edition = "2021"; - sha256 = "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"; - authors = [ - "Harry Fei " - ]; - dependencies = [ - { - name = "either"; - packageId = "either"; - } - { - name = "home"; - packageId = "home"; - target = { target, features }: ((target."windows" or false) || (target."unix" or false) || ("redox" == target."os" or null)); - } - { - name = "once_cell"; - packageId = "once_cell"; - target = { target, features }: (target."windows" or false); - } - { - name = "rustix"; - packageId = "rustix"; - usesDefaultFeatures = false; - features = [ "fs" "std" ]; - } - { - name = "windows-sys"; - packageId = "windows-sys 0.48.0"; - target = { target, features }: (target."windows" or false); - features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ]; - } - ]; - features = { - "regex" = [ "dep:regex" ]; - }; - }; "winapi" = rec { crateName = "winapi"; version = "0.3.9"; diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index d1a5da964..acc1a8bc1 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -44,7 +44,9 @@ redb = "2.1.1" [dependencies.bigtable_rs] optional = true -version = "0.2.10" +# https://github.com/liufuyang/bigtable_rs/pull/86 +git = "https://github.com/liufuyang/bigtable_rs" +rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" [dependencies.fuse-backend-rs] optional = true diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index 11679cb2e..42b46c251 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,3 +1,4 @@ { + "git+https://github.com/liufuyang/bigtable_rs?rev=1818355a5373a5bc2c84287e3a4e3807154ac8ef#0.2.10": "0mn6iw1z7gdxbarsqiwscbdr25nplwlvzs0rs51vgnnjfsnbgl6q", "git+https://github.com/tvlfyi/wu-manber.git#wu-manber@0.1.0": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" } \ No newline at end of file diff --git a/tvix/default.nix b/tvix/default.nix index 0791c17df..8e09c5b88 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -18,6 +18,7 @@ let (k: (lib.nameValuePair "${crates.internal.crates.${k}.crateName}-${crates.internal.crates.${k}.version}" crates.internal.crates.${k}.src.outputHash) ) [ + "bigtable_rs" "wu-manber" ]); }; diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index b542a7030..ffe05b4a3 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -54,7 +54,9 @@ version = "0.12.2" [dependencies.bigtable_rs] optional = true -version = "0.2.10" +# https://github.com/liufuyang/bigtable_rs/pull/86 +git = "https://github.com/liufuyang/bigtable_rs" +rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" [build-dependencies] prost-build = "0.13.1"