diff options
author | Florian Klink <flokli@flokli.de> | 2024-12-30T10·06+0100 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-12-30T11·38+0000 |
commit | 9fa198f9aeec2f0330938529b2865c9f2d122463 (patch) | |
tree | 4531f21c80aa4976453fabd0e140a3624c628480 /tvix | |
parent | b12ea8d786fa08e1ae24244aa9f940bbfcf8684a (diff) |
We don't need to use a git checkout here anymore. Change-Id: I99641a4908f39799c8be6a1610ae458ca6fdc5ee Reviewed-on: https://cl.tvl.fyi/c/depot/+/12931 Tested-by: BuildkiteCI Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix')
-rw-r--r-- | tvix/Cargo.lock | 159 | ||||
-rw-r--r-- | tvix/Cargo.nix | 207 | ||||
-rw-r--r-- | tvix/Cargo.toml | 3 | ||||
-rw-r--r-- | tvix/castore/src/directoryservice/bigtable.rs | 1 | ||||
-rw-r--r-- | tvix/crate-hashes.json | 3 | ||||
-rw-r--r-- | tvix/default.nix | 1 | ||||
-rw-r--r-- | tvix/store/src/pathinfoservice/bigtable.rs | 1 |
7 files changed, 221 insertions, 154 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 74cfa1d45aea..c36c5a3a2251 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -251,7 +251,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -278,7 +278,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -301,7 +301,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -397,7 +397,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -480,9 +480,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bigtable_rs" -version = "0.2.10" -source = "git+https://github.com/liufuyang/bigtable_rs?rev=1818355a5373a5bc2c84287e3a4e3807154ac8ef#1818355a5373a5bc2c84287e3a4e3807154ac8ef" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3499a348f466e9caf0ed509c3e2dd1f27f0530af168a6dc813348f6bf0475258" dependencies = [ + "futures-util", "gcp_auth", "http 1.1.0", "hyper-util", @@ -491,14 +493,15 @@ dependencies = [ "prost-build", "prost-types", "prost-wkt", + "prost-wkt-build", "prost-wkt-types", "serde", "serde_with", - "thiserror", + "thiserror 2.0.9", "tokio", "tonic", "tonic-build", - "tower 0.4.13", + "tower 0.5.1", ] [[package]] @@ -613,7 +616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -712,7 +715,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -945,7 +948,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -969,7 +972,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -980,7 +983,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -1027,7 +1030,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -1037,7 +1040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -1175,7 +1178,7 @@ checksum = "ba7795da175654fe16979af73f81f26a8ea27638d8d9823d317016888a63dc4c" dependencies = [ "num-traits", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -1425,7 +1428,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -1484,7 +1487,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "thiserror", + "thiserror 1.0.64", "tokio", "tracing", "tracing-futures", @@ -1551,7 +1554,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2158,7 +2161,7 @@ dependencies = [ "bitflags 2.6.0", "libc", "magic-sys", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -2304,7 +2307,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2337,7 +2340,7 @@ dependencies = [ "rstest", "serde", "sha2", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-listener", "tokio-util", @@ -2439,7 +2442,7 @@ dependencies = [ "serde_json", "sha2", "smol_str", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-test", "tracing", @@ -2457,7 +2460,7 @@ dependencies = [ "proptest", "quote", "rstest", - "syn 2.0.79", + "syn 2.0.87", "tokio", "tokio-test", ] @@ -2572,7 +2575,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2634,7 +2637,7 @@ dependencies = [ "serde_json", "strum", "strum_macros", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -2666,7 +2669,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -2694,7 +2697,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost", - "thiserror", + "thiserror 1.0.64", "tokio", "tonic", "tracing", @@ -2734,7 +2737,7 @@ dependencies = [ "percent-encoding", "rand", "serde_json", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-stream", "tracing", @@ -2823,7 +2826,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -2972,7 +2975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3003,7 +3006,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3061,7 +3064,7 @@ dependencies = [ "pulldown-cmark", "pulldown-cmark-to-cmark", "regex", - "syn 2.0.79", + "syn 2.0.87", "tempfile", ] @@ -3075,7 +3078,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3176,7 +3179,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2", - "thiserror", + "thiserror 1.0.64", "tokio", "tracing", ] @@ -3193,7 +3196,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "slab", - "thiserror", + "thiserror 1.0.64", "tinyvec", "tracing", ] @@ -3325,7 +3328,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -3433,7 +3436,7 @@ dependencies = [ "http 1.1.0", "reqwest", "serde", - "thiserror", + "thiserror 1.0.64", "tower-service", ] @@ -3461,7 +3464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9838134a2bfaa8e1f40738fcc972ac799de6e0e06b5157acb95fc2b05a0ea283" dependencies = [ "lazy_static", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -3525,7 +3528,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.79", + "syn 2.0.87", "unicode-ident", ] @@ -3538,7 +3541,7 @@ dependencies = [ "quote", "rand", "rustc_version", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3554,7 +3557,7 @@ dependencies = [ "mime", "mime_guess", "rand", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -3762,7 +3765,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -3795,7 +3798,7 @@ checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ "percent-encoding", "serde", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -3856,7 +3859,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4043,7 +4046,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4065,9 +4068,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -4150,7 +4153,16 @@ version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.64", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -4161,7 +4173,18 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -4288,7 +4311,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4478,7 +4501,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4612,7 +4635,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4712,7 +4735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -4785,7 +4808,7 @@ dependencies = [ "rstest", "serde_json", "tempfile", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-listener", "tonic", @@ -4836,7 +4859,7 @@ dependencies = [ "serde_tagged", "serde_with", "tempfile", - "thiserror", + "thiserror 1.0.64", "threadpool", "tokio", "tokio-retry", @@ -4878,7 +4901,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustyline", "smol_str", - "thiserror", + "thiserror 1.0.64", "tokio", "tracing", "tracing-indicatif", @@ -4924,7 +4947,7 @@ dependencies = [ "tabwriter", "tempfile", "test-strategy", - "thiserror", + "thiserror 1.0.64", "toml 0.6.0", "tvix-eval-builtin-macros", "vu128", @@ -4966,7 +4989,7 @@ dependencies = [ "sha1", "sha2", "tempfile", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-tar", "tokio-util", @@ -5031,7 +5054,7 @@ dependencies = [ "sha1", "sha2", "tempfile", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-listener", "tokio-retry", @@ -5065,7 +5088,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_sdk", "reqwest-tracing", - "thiserror", + "thiserror 1.0.64", "tokio", "tonic", "tracing", @@ -5108,7 +5131,7 @@ checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -5367,7 +5390,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -5401,7 +5424,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5516,7 +5539,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -5527,7 +5550,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] @@ -5766,7 +5789,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.87", ] [[package]] diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 85399c0db068..0a6c0f83b6e5 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -932,7 +932,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "visit-mut" ]; } ]; @@ -1009,7 +1009,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "proc-macro" "visit-mut" ]; } @@ -1062,7 +1062,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "visit" "visit-mut" ]; } ]; @@ -1468,14 +1468,14 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "parsing" "extra-traits" ]; } ]; devDependencies = [ { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "extra-traits" ]; } ]; @@ -1768,19 +1768,18 @@ rec { }; "bigtable_rs" = rec { crateName = "bigtable_rs"; - version = "0.2.10"; + version = "0.2.16"; edition = "2021"; - workspace_member = null; - src = pkgs.fetchgit { - url = "https://github.com/liufuyang/bigtable_rs"; - rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef"; - sha256 = "0mn6iw1z7gdxbarsqiwscbdr25nplwlvzs0rs51vgnnjfsnbgl6q"; - }; + sha256 = "0n2j8zq6p3rl2g46v2hnmwq0azzjs4nkx72hxpqcmsb6yi4a769l"; authors = [ "Fuyang Liu <liufuyang@users.noreply.github.com>" ]; dependencies = [ { + name = "futures-util"; + packageId = "futures-util"; + } + { name = "gcp_auth"; packageId = "gcp_auth"; } @@ -1825,7 +1824,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -1839,7 +1838,8 @@ rec { } { name = "tower"; - packageId = "tower 0.4.13"; + packageId = "tower 0.5.1"; + features = [ "util" ]; } ]; buildDependencies = [ @@ -1848,8 +1848,8 @@ rec { packageId = "prost-build"; } { - name = "prost-wkt-types"; - packageId = "prost-wkt-types"; + name = "prost-wkt-build"; + packageId = "prost-wkt-build"; } { name = "tonic-build"; @@ -2167,7 +2167,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; features = { @@ -2475,7 +2475,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -3138,7 +3138,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -3201,7 +3201,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "extra-traits" ]; } ]; @@ -3231,7 +3231,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; } ]; @@ -3370,7 +3370,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "extra-traits" ]; } ]; @@ -3396,7 +3396,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "extra-traits" ]; } ]; @@ -3781,7 +3781,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; } ]; @@ -4541,7 +4541,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -4743,7 +4743,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -4950,7 +4950,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; } ]; @@ -6783,7 +6783,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; @@ -7201,7 +7201,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "extra-traits" "full" ]; } ]; @@ -7303,7 +7303,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -7692,7 +7692,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -7791,7 +7791,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "extra-traits" ]; } ]; @@ -8143,14 +8143,14 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "parsing" ]; } ]; devDependencies = [ { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "extra-traits" "parsing" ]; } ]; @@ -8411,7 +8411,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; devDependencies = [ @@ -8498,7 +8498,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; usesDefaultFeatures = false; } ]; @@ -8591,7 +8591,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; usesDefaultFeatures = false; } { @@ -8772,7 +8772,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; usesDefaultFeatures = false; } { @@ -9028,7 +9028,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "parsing" "printing" "clone-impls" "proc-macro" "full" "visit-mut" ]; } @@ -9423,7 +9423,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "full" ]; } @@ -9436,7 +9436,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "parsing" ]; } @@ -9510,7 +9510,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; optional = true; usesDefaultFeatures = false; } @@ -9518,7 +9518,7 @@ rec { devDependencies = [ { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -9731,7 +9731,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; optional = true; features = [ "full" ]; } @@ -9779,7 +9779,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "extra-traits" ]; } ]; @@ -10084,7 +10084,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -10158,7 +10158,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tinyvec"; @@ -10532,7 +10532,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; features = { @@ -11071,7 +11071,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tower-service"; @@ -11207,7 +11207,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; @@ -11399,7 +11399,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "parsing" "extra-traits" "visit" "visit-mut" ]; } { @@ -11438,7 +11438,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" "extra-traits" ]; } ]; @@ -11494,7 +11494,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; devDependencies = [ @@ -12179,7 +12179,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } @@ -12271,7 +12271,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } ]; features = { @@ -12499,7 +12499,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "extra-traits" "full" "parsing" ]; } ]; @@ -13027,7 +13027,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "parsing" "extra-traits" ]; } ]; @@ -13080,11 +13080,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" "visit-mut" ]; }; - "syn 2.0.79" = rec { + "syn 2.0.87" = rec { crateName = "syn"; - version = "2.0.79"; + version = "2.0.87"; edition = "2021"; - sha256 = "147mk4sgigmvsb9l8qzj199ygf0fgb0bphwdsghn8205pz82q4w9"; + sha256 = "0bd3mfcswvn4jkrp7ich5kk58kmpph8412yxd36nsfnh8vilrai5"; authors = [ "David Tolnay <dtolnay@gmail.com>" ]; @@ -13275,7 +13275,7 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "thiserror" = rec { + "thiserror 1.0.64" = rec { crateName = "thiserror"; version = "1.0.64"; edition = "2021"; @@ -13286,12 +13286,31 @@ rec { dependencies = [ { name = "thiserror-impl"; - packageId = "thiserror-impl"; + packageId = "thiserror-impl 1.0.64"; } ]; }; - "thiserror-impl" = rec { + "thiserror 2.0.9" = rec { + crateName = "thiserror"; + version = "2.0.9"; + edition = "2021"; + sha256 = "1k5j0ri0kjrnlblv5ikaglbkg1sxxwh0qrxbidxgc38rs0zn8wph"; + authors = [ + "David Tolnay <dtolnay@gmail.com>" + ]; + dependencies = [ + { + name = "thiserror-impl"; + packageId = "thiserror-impl 2.0.9"; + } + ]; + features = { + "default" = [ "std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; + "thiserror-impl 1.0.64" = rec { crateName = "thiserror-impl"; version = "1.0.64"; edition = "2021"; @@ -13312,7 +13331,33 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; + } + ]; + + }; + "thiserror-impl 2.0.9" = rec { + crateName = "thiserror-impl"; + version = "2.0.9"; + edition = "2021"; + sha256 = "1m77z5vb4w7xn7y12zxnbwncva4bwbi45y45xvkf5aki20kzll3v"; + procMacro = true; + libName = "thiserror_impl"; + authors = [ + "David Tolnay <dtolnay@gmail.com>" + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.87"; } ]; @@ -13778,7 +13823,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -14479,7 +14524,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; } ]; features = { @@ -15090,7 +15135,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -15482,7 +15527,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -15726,7 +15771,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -15922,7 +15967,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "threadpool"; @@ -16132,7 +16177,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -16302,7 +16347,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "toml"; @@ -16457,7 +16502,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -16722,7 +16767,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -16903,7 +16948,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror"; + packageId = "thiserror 1.0.64"; } { name = "tokio"; @@ -17034,7 +17079,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } ]; @@ -17705,7 +17750,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "full" ]; } { @@ -17798,7 +17843,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; features = [ "visit" "visit-mut" "full" ]; } { @@ -19221,7 +19266,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "parsing" "proc-macro" "printing" "full" "derive" ]; } @@ -19249,7 +19294,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; usesDefaultFeatures = false; features = [ "parsing" "proc-macro" "printing" "full" "derive" "clone-impls" ]; } @@ -20559,7 +20604,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.79"; + packageId = "syn 2.0.87"; } ]; diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml index c4b2dd4dcac7..9b534e724469 100644 --- a/tvix/Cargo.toml +++ b/tvix/Cargo.toml @@ -49,8 +49,7 @@ async-tempfile = "0.4.0" axum = "0.7.5" axum-extra = "0.9.3" axum-range = "0.4.0" -# https://github.com/liufuyang/bigtable_rs/pull/86 -bigtable_rs = { git = "https://github.com/liufuyang/bigtable_rs", rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" } +bigtable_rs = "0.2.16" bitflags = "2.6.0" blake3 = "1.5.4" bstr = "1.10.0" diff --git a/tvix/castore/src/directoryservice/bigtable.rs b/tvix/castore/src/directoryservice/bigtable.rs index 7473481c94b5..a5921b5870e4 100644 --- a/tvix/castore/src/directoryservice/bigtable.rs +++ b/tvix/castore/src/directoryservice/bigtable.rs @@ -276,6 +276,7 @@ impl DirectoryService for BigtableDirectoryService { .check_and_mutate_row(bigtable_v2::CheckAndMutateRowRequest { table_name: client.get_full_table_name(&self.params.table_name), app_profile_id: self.params.app_profile_id.to_string(), + authorized_view_name: "".to_string(), row_key: directory_key.clone().into(), predicate_filter: Some(bigtable_v2::RowFilter { filter: Some(bigtable_v2::row_filter::Filter::ColumnQualifierRegexFilter( diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index 46a15356e97f..29789992d8ad 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,6 +1,5 @@ { "git+https://github.com/TrueLayer/reqwest-middleware?rev=8a494c165734e24c62823714843e1c9347027e8a#0.4.0": "10gaxsvqld8dfwnm0nk93sqbbd2mjl7zfdf6vglp6waka7h87mba", "git+https://github.com/TrueLayer/reqwest-middleware?rev=8a494c165734e24c62823714843e1c9347027e8a#reqwest-tracing@0.5.4": "10gaxsvqld8dfwnm0nk93sqbbd2mjl7zfdf6vglp6waka7h87mba", - "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 dece9f06c0c5..7aba4e4be0c1 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -18,7 +18,6 @@ let (k: (lib.nameValuePair "${crates.internal.crates.${k}.crateName}-${crates.internal.crates.${k}.version}" crates.internal.crates.${k}.src.outputHash) ) [ - "bigtable_rs" "reqwest-middleware" "reqwest-tracing" "wu-manber" diff --git a/tvix/store/src/pathinfoservice/bigtable.rs b/tvix/store/src/pathinfoservice/bigtable.rs index ce6faa2d3743..a99cbfb8ef60 100644 --- a/tvix/store/src/pathinfoservice/bigtable.rs +++ b/tvix/store/src/pathinfoservice/bigtable.rs @@ -269,6 +269,7 @@ impl PathInfoService for BigtablePathInfoService { .check_and_mutate_row(bigtable_v2::CheckAndMutateRowRequest { table_name: client.get_full_table_name(&self.params.table_name), app_profile_id: self.params.app_profile_id.to_string(), + authorized_view_name: "".to_string(), row_key: path_info_key.clone().into(), predicate_filter: Some(bigtable_v2::RowFilter { filter: Some(bigtable_v2::row_filter::Filter::ColumnQualifierRegexFilter( |