about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-07-01T07·48+0300
committerclbot <clbot@tvl.fyi>2024-07-01T15·53+0000
commitf6c759de584005a10ec614ce6e51698253bb0404 (patch)
tree7e80b5d535c2db533806e2693462adcdf291fc40
parent6a9a4d56a4a99acb95c2b4ca1d590490c7732f79 (diff)
chore(tvix): bump bigtable_rs to latest release r/8334
https://github.com/liufuyang/bigtable_rs/pull/72 has been merged for a
while, no need to use our own checkout here.

Change-Id: Ide5acd9b7e0f5a46b1c795178e29a037206b2448
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11906
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
-rw-r--r--tvix/Cargo.lock5
-rw-r--r--tvix/Cargo.nix9
-rw-r--r--tvix/castore/Cargo.toml4
-rw-r--r--tvix/crate-hashes.json1
-rw-r--r--tvix/default.nix1
-rw-r--r--tvix/store/Cargo.toml4
6 files changed, 7 insertions, 17 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index d115ade76c9e..d61dd20927a6 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -377,8 +377,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bigtable_rs"
-version = "0.2.9"
-source = "git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0af404741dfc40eb9fa99cf4d4140a09c5c20df7"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12ccba0acd0a82afb2b1fe89181b0776ff18aef5e355030631fe534c8ae8ec73"
 dependencies = [
  "gcp_auth",
  "http",
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 32fc64c62fa3..5a2a3e2b5142 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -1283,14 +1283,9 @@ rec {
       };
       "bigtable_rs" = rec {
         crateName = "bigtable_rs";
-        version = "0.2.9";
+        version = "0.2.10";
         edition = "2021";
-        workspace_member = null;
-        src = pkgs.fetchgit {
-          url = "https://github.com/flokli/bigtable_rs";
-          rev = "0af404741dfc40eb9fa99cf4d4140a09c5c20df7";
-          sha256 = "1njjam1lx2xlnm7a41lga8601vmjgqz0fvc77x24gd04pc7avxll";
-        };
+        sha256 = "0wzcx254qlzy64306mg3ynp1izvn0wdii2gyn6raz0harl5bmk0j";
         authors = [
           "Fuyang Liu <liufuyang@users.noreply.github.com>"
         ];
diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml
index dc30419f7cbd..d5d5c73f0a2d 100644
--- a/tvix/castore/Cargo.toml
+++ b/tvix/castore/Cargo.toml
@@ -40,9 +40,7 @@ petgraph = "0.6.4"
 
 [dependencies.bigtable_rs]
 optional = true
-# https://github.com/liufuyang/bigtable_rs/pull/72
-git = "https://github.com/flokli/bigtable_rs"
-rev = "0af404741dfc40eb9fa99cf4d4140a09c5c20df7"
+version = "0.2.10"
 
 [dependencies.fuse-backend-rs]
 optional = true
diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json
index 2c1e740cb9b1..11679cb2ebdd 100644
--- a/tvix/crate-hashes.json
+++ b/tvix/crate-hashes.json
@@ -1,4 +1,3 @@
 {
-  "git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0.2.9": "1njjam1lx2xlnm7a41lga8601vmjgqz0fvc77x24gd04pc7avxll",
   "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 efbaf54f46c4..a181484286e9 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -112,7 +112,6 @@ let
         (crateName:
           (lib.nameValuePair "${crateName}-${crates.internal.crates.${crateName}.version}" crates.internal.crates.${crateName}.src.outputHash)
         ) [
-        "bigtable_rs"
         "wu-manber"
       ]);
   };
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 5dd1747c1508..98760589cc78 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -48,9 +48,7 @@ version = "0.11.0"
 
 [dependencies.bigtable_rs]
 optional = true
-# https://github.com/liufuyang/bigtable_rs/pull/72
-git = "https://github.com/flokli/bigtable_rs"
-rev = "0af404741dfc40eb9fa99cf4d4140a09c5c20df7"
+version = "0.2.10"
 
 [build-dependencies]
 prost-build = "0.12.1"