about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--tvix/Cargo.lock40
-rw-r--r--tvix/Cargo.nix53
2 files changed, 47 insertions, 46 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 397778e6ce5f..48c0b414bef9 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -2258,8 +2258,8 @@ dependencies = [
  "tokio",
  "tokio-listener",
  "tokio-util",
- "tonic 0.12.1",
- "tonic-build 0.12.1",
+ "tonic 0.12.2",
+ "tonic-build 0.12.2",
  "tower",
  "tower-http",
  "tracing",
@@ -2569,7 +2569,7 @@ dependencies = [
  "prost 0.13.1",
  "thiserror",
  "tokio",
- "tonic 0.12.1",
+ "tonic 0.12.2",
 ]
 
 [[package]]
@@ -2581,7 +2581,7 @@ dependencies = [
  "opentelemetry 0.24.0",
  "opentelemetry_sdk 0.24.1",
  "prost 0.13.1",
- "tonic 0.12.1",
+ "tonic 0.12.2",
 ]
 
 [[package]]
@@ -2948,7 +2948,7 @@ checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1"
 dependencies = [
  "bytes",
  "heck",
- "itertools 0.12.0",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
@@ -2981,7 +2981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
 dependencies = [
  "anyhow",
- "itertools 0.12.0",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.72",
@@ -4235,7 +4235,7 @@ dependencies = [
  "socket2",
  "tokio",
  "tokio-util",
- "tonic 0.12.1",
+ "tonic 0.12.2",
  "tower",
  "tower-service",
  "tracing",
@@ -4449,9 +4449,9 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401"
+checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4495,9 +4495,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568392c5a2bd0020723e3f387891176aabafe36fd9fcd074ad309dfa0c8eb964"
+checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67"
 dependencies = [
  "prettyplease",
  "proc-macro2",
@@ -4516,7 +4516,7 @@ dependencies = [
  "prost 0.13.1",
  "tokio",
  "tokio-stream",
- "tonic 0.12.1",
+ "tonic 0.12.2",
 ]
 
 [[package]]
@@ -4529,7 +4529,7 @@ dependencies = [
  "prost-types 0.13.1",
  "tokio",
  "tokio-stream",
- "tonic 0.12.1",
+ "tonic 0.12.2",
 ]
 
 [[package]]
@@ -4766,8 +4766,8 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-listener",
- "tonic 0.12.1",
- "tonic-build 0.12.1",
+ "tonic 0.12.2",
+ "tonic-build 0.12.2",
  "tonic-reflection",
  "tracing",
  "tvix-castore",
@@ -4820,8 +4820,8 @@ dependencies = [
  "tokio-stream",
  "tokio-tar",
  "tokio-util",
- "tonic 0.12.1",
- "tonic-build 0.12.1",
+ "tonic 0.12.2",
+ "tonic-build 0.12.2",
  "tonic-reflection",
  "tower",
  "tracing",
@@ -5014,8 +5014,8 @@ dependencies = [
  "tokio-stream",
  "tokio-util",
  "toml 0.8.15",
- "tonic 0.12.1",
- "tonic-build 0.12.1",
+ "tonic 0.12.2",
+ "tonic-build 0.12.2",
  "tonic-health",
  "tonic-reflection",
  "tower",
@@ -5043,7 +5043,7 @@ dependencies = [
  "reqwest-tracing",
  "thiserror",
  "tokio",
- "tonic 0.12.1",
+ "tonic 0.12.2",
  "tracing",
  "tracing-indicatif",
  "tracing-opentelemetry 0.25.0",
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index be49a5c019b6..c9d824490c36 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -6105,7 +6105,7 @@ rec {
           "default" = [ "use_std" ];
           "use_std" = [ "use_alloc" "either/use_std" ];
         };
-        resolvedDefaultFeatures = [ "use_alloc" ];
+        resolvedDefaultFeatures = [ "default" "use_alloc" "use_std" ];
       };
       "itertools 0.12.0" = rec {
         crateName = "itertools";
@@ -7106,7 +7106,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             features = [ "tls" "tls-roots" ];
           }
           {
@@ -7151,7 +7151,7 @@ rec {
           }
           {
             name = "tonic-build";
-            packageId = "tonic-build 0.12.1";
+            packageId = "tonic-build 0.12.2";
           }
         ];
         devDependencies = [
@@ -8193,7 +8193,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             optional = true;
             usesDefaultFeatures = false;
           }
@@ -8259,7 +8259,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             optional = true;
             usesDefaultFeatures = false;
             features = [ "codegen" "prost" ];
@@ -9438,7 +9438,7 @@ rec {
           }
           {
             name = "itertools";
-            packageId = "itertools 0.12.0";
+            packageId = "itertools 0.11.0";
             usesDefaultFeatures = false;
             features = [ "use_alloc" ];
           }
@@ -9558,7 +9558,7 @@ rec {
           }
           {
             name = "itertools";
-            packageId = "itertools 0.12.0";
+            packageId = "itertools 0.11.0";
           }
           {
             name = "proc-macro2";
@@ -13598,7 +13598,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             rename = "tonic_012";
             optional = true;
           }
@@ -14394,11 +14394,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "tls" "transport" ];
       };
-      "tonic 0.12.1" = rec {
+      "tonic 0.12.2" = rec {
         crateName = "tonic";
-        version = "0.12.1";
+        version = "0.12.2";
         edition = "2021";
-        sha256 = "00bl9i4fal2s90g1p877053dkpbxvgsqj5c24y6mka5bj559yr9q";
+        sha256 = "1bc8m8r7ysgkb7mhs3b3mvivd43nwaix6qnqhfp5hb2bkscbmxn6";
         authors = [
           "Lucio Franco <luciofranco14@gmail.com>"
         ];
@@ -14550,12 +14550,13 @@ rec {
           "router" = [ "dep:axum" "dep:tower" "tower?/util" ];
           "server" = [ "router" "dep:async-stream" "dep:h2" "dep:hyper" "hyper?/server" "dep:hyper-util" "hyper-util?/service" "hyper-util?/server-auto" "dep:socket2" "dep:tokio" "tokio?/macros" "tokio?/net" "tokio?/time" "tokio-stream/net" "dep:tower" "tower?/util" "tower?/limit" ];
           "tls" = [ "dep:rustls-pemfile" "dep:tokio-rustls" "dep:tokio" "tokio?/rt" "tokio?/macros" ];
-          "tls-roots" = [ "tls" "channel" "dep:rustls-native-certs" ];
+          "tls-native-roots" = [ "tls" "channel" "dep:rustls-native-certs" ];
+          "tls-roots" = [ "tls-native-roots" ];
           "tls-webpki-roots" = [ "tls" "channel" "dep:webpki-roots" ];
           "transport" = [ "server" "channel" ];
           "zstd" = [ "dep:zstd" ];
         };
-        resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "router" "server" "tls" "tls-roots" "transport" ];
+        resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "router" "server" "tls" "tls-native-roots" "tls-roots" "transport" ];
       };
       "tonic-build 0.11.0" = rec {
         crateName = "tonic-build";
@@ -14597,11 +14598,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "cleanup-markdown" "default" "prost" "prost-build" "transport" ];
       };
-      "tonic-build 0.12.1" = rec {
+      "tonic-build 0.12.2" = rec {
         crateName = "tonic-build";
-        version = "0.12.1";
+        version = "0.12.2";
         edition = "2021";
-        sha256 = "0r5riq6gm79hmmsd1z6rdziszava2y8phf1z7rr2005xlb2r50sn";
+        sha256 = "0rwaxvsx4rld1ncmcih0bvmg8k8ah4r1ccyjwgbnn4shfa3yhkpy";
         libName = "tonic_build";
         authors = [
           "Lucio Franco <luciofranco14@gmail.com>"
@@ -14666,7 +14667,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             usesDefaultFeatures = false;
             features = [ "codegen" "prost" ];
           }
@@ -14720,7 +14721,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             usesDefaultFeatures = false;
             features = [ "codegen" "prost" ];
           }
@@ -14728,7 +14729,7 @@ rec {
         devDependencies = [
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             usesDefaultFeatures = false;
             features = [ "transport" ];
           }
@@ -15712,7 +15713,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             features = [ "tls" "tls-roots" ];
           }
           {
@@ -15744,7 +15745,7 @@ rec {
           }
           {
             name = "tonic-build";
-            packageId = "tonic-build 0.12.1";
+            packageId = "tonic-build 0.12.2";
           }
         ];
         devDependencies = [
@@ -15911,7 +15912,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
           }
           {
             name = "tonic-reflection";
@@ -15985,7 +15986,7 @@ rec {
           }
           {
             name = "tonic-build";
-            packageId = "tonic-build 0.12.1";
+            packageId = "tonic-build 0.12.2";
           }
         ];
         devDependencies = [
@@ -16710,7 +16711,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             features = [ "tls" "tls-roots" ];
           }
           {
@@ -16765,7 +16766,7 @@ rec {
           }
           {
             name = "tonic-build";
-            packageId = "tonic-build 0.12.1";
+            packageId = "tonic-build 0.12.2";
           }
         ];
         devDependencies = [
@@ -16866,7 +16867,7 @@ rec {
           }
           {
             name = "tonic";
-            packageId = "tonic 0.12.1";
+            packageId = "tonic 0.12.2";
             optional = true;
           }
           {