mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix): Migrate members to inherit deps from workspace

Browse source 
From now on we will add the dependencies and their version in the root
Cargo.toml and in order to enable the dependency for a workspace member
we set `workspace = true` in the member's Cargo.toml.

Change-Id: I9738c1cf99810b7ace87ca712c3ea965ba846e25
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12389
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
Ilan Joselevich 2024-08-29 00:54:46 +03:00 committed by clbot
parent 2945a359b4
commit 5a97888d8b
16 changed files with 451 additions and 375 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tvix/Cargo.lock generated
View file

@ -67,15 +67,16 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]] [[package]]
name = "anstream" name = "anstream"
version = "0.6.11" version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"anstyle-parse", "anstyle-parse",
"anstyle-query", "anstyle-query",
"anstyle-wincon", "anstyle-wincon",
"colorchoice", "colorchoice",
"is_terminal_polyfill",
"utf8parse", "utf8parse",
] ]
@ -87,27 +88,27 @@ checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]] [[package]]
name = "anstyle-parse" name = "anstyle-parse"
version = "0.2.3" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
dependencies = [ dependencies = [
"utf8parse", "utf8parse",
] ]
[[package]] [[package]]
name = "anstyle-query" name = "anstyle-query"
version = "1.0.2" version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
dependencies = [ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
name = "anstyle-wincon" name = "anstyle-wincon"
version = "3.0.2" version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"windows-sys 0.52.0", "windows-sys 0.52.0",
@ -662,9 +663,9 @@ dependencies = [
[[package]] [[package]]
name = "colorchoice" name = "colorchoice"
version = "1.0.0" version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]] [[package]]
name = "concurrent-queue" name = "concurrent-queue"
@ -1768,6 +1769,12 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.10.5" version = "0.10.5"

37
tvix/Cargo.nix
View file

@ -362,9 +362,9 @@ rec {
}; };
"anstream" = rec { "anstream" = rec {
crateName = "anstream"; crateName = "anstream";
version = "0.6.11"; version = "0.6.15";
edition = "2021"; edition = "2021";
sha256 = "19dndamalavhjwp4i74k8hdijcixb7gsfa6ycwyc1r8xn6y1wbkf"; sha256 = "09nm4qj34kiwgzczdvj14x7hgsb235g4sqsay3xsz7zqn4d5rqb4";
dependencies = [ dependencies = [
{ {
name = "anstyle"; name = "anstyle";
@ -389,6 +389,10 @@ rec {
name = "colorchoice"; name = "colorchoice";
packageId = "colorchoice"; packageId = "colorchoice";
} }
{
name = "is_terminal_polyfill";
packageId = "is_terminal_polyfill";
}
{ {
name = "utf8parse"; name = "utf8parse";
packageId = "utf8parse"; packageId = "utf8parse";
@ -413,9 +417,9 @@ rec {
}; };
"anstyle-parse" = rec { "anstyle-parse" = rec {
crateName = "anstyle-parse"; crateName = "anstyle-parse";
version = "0.2.3"; version = "0.2.5";
edition = "2021"; edition = "2021";
sha256 = "134jhzrz89labrdwxxnjxqjdg06qvaflj1wkfnmyapwyldfwcnn7"; sha256 = "1jy12rvgbldflnb2x7mcww9dcffw1mx22nyv6p3n7d62h0gdwizb";
libName = "anstyle_parse"; libName = "anstyle_parse";
dependencies = [ dependencies = [
{ {
@ -433,9 +437,9 @@ rec {
}; };
"anstyle-query" = rec { "anstyle-query" = rec {
crateName = "anstyle-query"; crateName = "anstyle-query";
version = "1.0.2"; version = "1.1.1";
edition = "2021"; edition = "2021";
sha256 = "0j3na4b1nma39g4x7cwvj009awxckjf3z2vkwhldgka44hqj72g2"; sha256 = "0aj22iy4pzk6mz745sfrm1ym14r0y892jhcrbs8nkj7nqx9gqdkd";
libName = "anstyle_query"; libName = "anstyle_query";
dependencies = [ dependencies = [
{ {
@ -449,9 +453,9 @@ rec {
}; };
"anstyle-wincon" = rec { "anstyle-wincon" = rec {
crateName = "anstyle-wincon"; crateName = "anstyle-wincon";
version = "3.0.2"; version = "3.0.4";
edition = "2021"; edition = "2021";
sha256 = "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w"; sha256 = "1y2pkvsrdxbcwircahb4wimans2pzmwwxad7ikdhj5lpdqdlxxsv";
libName = "anstyle_wincon"; libName = "anstyle_wincon";
dependencies = [ dependencies = [
{ {
@ -2228,9 +2232,9 @@ rec {
}; };
"colorchoice" = rec { "colorchoice" = rec {
crateName = "colorchoice"; crateName = "colorchoice";
version = "1.0.0"; version = "1.0.2";
edition = "2021"; edition = "2021";
sha256 = "1ix7w85kwvyybwi2jdkl3yva2r2bvdcc3ka2grjfzfgrapqimgxc"; sha256 = "1h18ph538y8yjmbpaf8li98l0ifms2xmh3rax9666c5qfjfi3zfk";
}; };
"concurrent-queue" = rec { "concurrent-queue" = rec {
@ -5579,6 +5583,14 @@ rec {
]; ];
}; };
"is_terminal_polyfill" = rec {
crateName = "is_terminal_polyfill";
version = "1.70.1";
edition = "2021";
sha256 = "1kwfgglh91z33kl0w5i338mfpa3zs0hidq5j4ny4rmjwrikchhvr";
features = { };
resolvedDefaultFeatures = [ "default" ];
};
"itertools 0.10.5" = rec { "itertools 0.10.5" = rec {
crateName = "itertools"; crateName = "itertools";
version = "0.10.5"; version = "0.10.5";
@ -6615,6 +6627,7 @@ rec {
{ {
name = "futures"; name = "futures";
packageId = "futures"; packageId = "futures";
usesDefaultFeatures = false;
} }
{ {
name = "itertools"; name = "itertools";
@ -14777,6 +14790,7 @@ rec {
{ {
name = "futures"; name = "futures";
packageId = "futures"; packageId = "futures";
usesDefaultFeatures = false;
} }
{ {
name = "hyper-util"; name = "hyper-util";
@ -15324,7 +15338,6 @@ rec {
{ {
name = "clap"; name = "clap";
packageId = "clap"; packageId = "clap";
usesDefaultFeatures = false;
} }
{ {
name = "data-encoding"; name = "data-encoding";
@ -15333,6 +15346,7 @@ rec {
{ {
name = "futures"; name = "futures";
packageId = "futures"; packageId = "futures";
usesDefaultFeatures = false;
} }
{ {
name = "magic"; name = "magic";
@ -15562,6 +15576,7 @@ rec {
{ {
name = "futures"; name = "futures";
packageId = "futures"; packageId = "futures";
usesDefaultFeatures = false;
} }
{ {
name = "hyper-util"; name = "hyper-util";

120
tvix/Cargo.toml
View file

@ -39,6 +39,126 @@ members = [
# https://github.com/rust-lang/rust-clippy/issues/12281 # https://github.com/rust-lang/rust-clippy/issues/12281
blocks_in_conditions = "allow" blocks_in_conditions = "allow"
[workspace.dependencies]
anyhow = "1.0.86"
async-compression = "0.4.12"
async-process = "2.2.4"
async-stream = "0.3.5"
async-tempfile = "0.4.0"
axum = "0.7.5"
bigtable_rs = { git = "https://github.com/liufuyang/bigtable_rs", rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" }
bitflags = "2.6.0"
blake3 = "1.5.4"
bstr = "1.10.0"
bytes = "1.7.1"
clap = "4.5.16"
codemap = "0.1.3"
codemap-diagnostic = "0.1.2"
count-write = "0.1.0"
criterion = "0.5"
data-encoding = "2.6.0"
digest = "0.10.7"
dirs = "4.0.0"
ed25519 = "2.2.3"
ed25519-dalek = "2.1.1"
enum-primitive-derive = "0.3.0"
erased-serde = "0.4.5"
expect-test = "1.5.0"
fastcdc = "3.1.0"
fuse-backend-rs = "0.11.0"
futures = { version = "0.3.30", default-features = false }
genawaiter = { version = "0.99.1", default-features = false }
glob = "0.3.1"
hex-literal = "0.4.1"
http = "1.1.0"
hyper-util = "0.1.7"
indicatif = "0.17.8"
itertools = "0.12.1"
lazy_static = "1.5.0"
lexical-core = "0.8.5"
libc = "0.2.158"
lru = "0.12.4"
magic = "0.16.2"
md-5 = "0.10.6"
mimalloc = "0.1.43"
nix = "0.27.1"
nohash-hasher = "0.2.0"
nom = "7.1.3"
num-traits = "0.2.19"
object_store = "0.10.2"
opentelemetry = "0.24.0"
opentelemetry-http = "0.13.0"
opentelemetry-otlp = "0.17.0"
opentelemetry_sdk = "0.24.1"
os_str_bytes = "6.6"
parking_lot = "0.12.3"
path-clean = "0.1"
petgraph = "0.6.5"
pin-project = "1.1"
pin-project-lite = "0.2.14"
pretty_assertions = "1.4.0"
proc-macro2 = "1.0.86"
proptest = { version = "1.5.0", default-features = false }
prost = "0.13.1"
prost-build = "0.13.1"
quote = "1.0.37"
redb = "2.1.2"
regex = "1.10.6"
reqwest = { version = "0.12.7", default-features = false }
reqwest-middleware = "0.3.3"
reqwest-tracing = { version = "0.5.3", default-features = false }
rnix = "0.11.0"
rowan = "*"
rstest = "0.19.0"
rstest_reuse = "0.6.0"
rustc-hash = "2.0.0"
rustyline = "10.1.1"
serde = "1.0.209"
serde_json = "1.0"
serde_qs = "0.12.0"
serde_tagged = "0.3.0"
serde_with = "3.9.0"
sha1 = "0.10.6"
sha2 = "0.10.8"
sled = "0.34.7"
smol_str = "0.2.2"
tabwriter = "1.4"
tempfile = "3.12.0"
test-strategy = "0.2.1"
thiserror = "1.0.63"
threadpool = "1.8.1"
tokio = "1.39.3"
tokio-listener = "0.4.3"
tokio-retry = "0.3.0"
tokio-stream = "0.1.15"
tokio-tar = "0.3.1"
tokio-test = "0.4.4"
tokio-util = "0.7.11"
tonic = "0.12.2"
tonic-build = "0.12.2"
tonic-health = { version = "0.12.2", default-features = false }
tonic-reflection = "0.12.2"
tower = "0.4.13"
tower-http = "0.5.2"
tracing = "0.1.40"
tracing-indicatif = "0.3.6"
tracing-opentelemetry = "0.25.0"
tracing-subscriber = "0.3.18"
tracing-tracy = "0.11.2"
trybuild = "1.0.99"
url = "2.5.2"
vhost = "0.6"
vhost-user-backend = "0.8"
virtio-bindings = "0.2.2"
virtio-queue = "0.7"
vm-memory = "0.10"
vmm-sys-util = "0.11"
vu128 = "1.1.0"
walkdir = "2.5.0"
wu-manber = { git = "https://github.com/tvlfyi/wu-manber.git" }
xattr = "1.3.1"
zstd = "0.13.2"
# Add a profile to all targets that enables release optimisations, but # Add a profile to all targets that enables release optimisations, but
# retains debug symbols. This is great for use with # retains debug symbols. This is great for use with
# benchmarking/profiling tools. # benchmarking/profiling tools.

33
tvix/build/Cargo.toml
View file

@ -4,34 +4,31 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
bytes = "1.7.1" bytes = { workspace = true }
clap = { version = "4.5", features = ["derive", "env"] } clap = { workspace = true, features = ["derive", "env"] }
itertools = "0.12.1" itertools = { workspace = true }
prost = "0.13.1" prost = { workspace = true }
thiserror = "1.0.63" thiserror = { workspace = true }
tokio = { version = "1.39.3" } tokio = { workspace = true }
tokio-listener = { version = "0.4.3", features = [ "tonic012" ] } tokio-listener = { workspace = true, features = ["tonic012"] }
tonic = { version = "0.12.2", features = ["tls", "tls-roots"] } tonic = { workspace = true, features = ["tls", "tls-roots"] }
tvix-castore = { path = "../castore" } tvix-castore = { path = "../castore" }
tvix-tracing = { path = "../tracing" } tvix-tracing = { path = "../tracing" }
tracing = "0.1.40" tracing = { workspace = true }
url = "2.5.2" url = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
tonic-reflection = { workspace = true, optional = true }
[dependencies.tonic-reflection]
optional = true
version = "0.12.2"
[build-dependencies] [build-dependencies]
prost-build = "0.13.1" prost-build = { workspace = true }
tonic-build = "0.12.2" tonic-build = { workspace = true }
[features] [features]
default = [] default = []
tonic-reflection = ["dep:tonic-reflection", "tvix-castore/tonic-reflection"] tonic-reflection = ["dep:tonic-reflection", "tvix-castore/tonic-reflection"]
[dev-dependencies] [dev-dependencies]
rstest = "0.19.0" rstest = { workspace = true }
[lints] [lints]
workspace = true workspace = true

149
tvix/castore/Cargo.toml
View file

@ -4,103 +4,68 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
async-compression = { version = "0.4.12", features = ["tokio", "zstd"]} async-compression = { workspace = true, features = ["tokio", "zstd"] }
async-stream = "0.3.5" async-stream = { workspace = true }
async-tempfile = "0.4.0" async-tempfile = { workspace = true }
blake3 = { version = "1.5.4", features = ["rayon", "std", "traits-preview"] } blake3 = { workspace = true, features = ["rayon", "std", "traits-preview"] }
bstr = "1.10.0" bstr = { workspace = true }
bytes = "1.7.1" bytes = { workspace = true }
data-encoding = "2.6.0" data-encoding = { workspace = true }
digest = "0.10.7" digest = { workspace = true }
fastcdc = { version = "3.1.0", features = ["tokio"] } fastcdc = { workspace = true, features = ["tokio"] }
futures = "0.3.30" futures = { workspace = true }
lazy_static = "1.5.0" lazy_static = { workspace = true }
object_store = { version = "0.10.2", features = ["http"] } object_store = { workspace = true, features = ["http"] }
parking_lot = "0.12.3" parking_lot = { workspace = true }
pin-project-lite = "0.2.14" pin-project-lite = { workspace = true }
prost = "0.13.1" prost = { workspace = true }
sled = { version = "0.34.7" } sled = { workspace = true }
thiserror = "1.0.63" thiserror = { workspace = true }
tokio-stream = { version = "0.1.15", features = ["fs", "net"] } tokio-stream = { workspace = true, features = ["fs", "net"] }
tokio-util = { version = "0.7.11", features = ["io", "io-util", "codec"] } tokio-util = { workspace = true, features = ["io", "io-util", "codec"] }
tokio-tar = "0.3.1" tokio-tar = { workspace = true }
tokio = { version = "1.39.3", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } tokio = { workspace = true, features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] }
tonic = "0.12.2" tonic = { workspace = true }
tower = "0.4.13" tower = { workspace = true }
tracing = "0.1.40" tracing = { workspace = true }
tracing-indicatif = "0.3.6" tracing-indicatif = { workspace = true }
tvix-tracing = { path = "../tracing", features = ["tonic"] } tvix-tracing = { path = "../tracing", features = ["tonic"] }
url = "2.5.2" url = { workspace = true }
walkdir = "2.5.0" walkdir = { workspace = true }
zstd = "0.13.2" zstd = { workspace = true }
serde = { version = "1.0.209", features = [ "derive" ] } serde = { workspace = true, features = ["derive"] }
serde_with = "3.9.0" serde_with = { workspace = true }
serde_qs = "0.12.0" serde_qs = { workspace = true }
petgraph = "0.6.5" petgraph = { workspace = true }
erased-serde = "0.4.5" erased-serde = { workspace = true }
serde_tagged = "0.3.0" serde_tagged = { workspace = true }
hyper-util = "0.1.7" hyper-util = { workspace = true }
redb = "2.1.2" redb = { workspace = true }
bigtable_rs = { workspace = true, optional = true }
[dependencies.bigtable_rs] fuse-backend-rs = { workspace = true, optional = true }
optional = true libc = { workspace = true, optional = true }
# https://github.com/liufuyang/bigtable_rs/pull/86 threadpool = { workspace = true, optional = true }
git = "https://github.com/liufuyang/bigtable_rs" tonic-reflection = { workspace = true, optional = true }
rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" vhost = { workspace = true, optional = true }
vhost-user-backend = { workspace = true, optional = true }
[dependencies.fuse-backend-rs] virtio-queue = { workspace = true, optional = true }
optional = true vm-memory = { workspace = true, optional = true }
version = "0.11.0" vmm-sys-util = { workspace = true, optional = true }
virtio-bindings = { workspace = true, optional = true }
[dependencies.libc]
optional = true
version = "0.2.158"
[dependencies.threadpool]
version = "1.8.1"
optional = true
[dependencies.tonic-reflection]
optional = true
version = "0.12.2"
[dependencies.vhost]
optional = true
version = "0.6"
[dependencies.vhost-user-backend]
optional = true
version = "0.8"
[dependencies.virtio-queue]
optional = true
version = "0.7"
[dependencies.vm-memory]
optional = true
version = "0.10"
[dependencies.vmm-sys-util]
optional = true
version = "0.11"
[dependencies.virtio-bindings]
optional = true
version = "0.2.2"
[build-dependencies] [build-dependencies]
prost-build = "0.13.1" prost-build = { workspace = true }
tonic-build = "0.12.2" tonic-build = { workspace = true }
[dev-dependencies] [dev-dependencies]
async-process = "2.2.4" async-process = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
tempfile = "3.12.0" tempfile = { workspace = true }
tokio-retry = "0.3.0" tokio-retry = { workspace = true }
hex-literal = "0.4.1" hex-literal = { workspace = true }
rstest_reuse = "0.6.0" rstest_reuse = { workspace = true }
xattr = "1.3.1" xattr = { workspace = true }
serde_json = "*" serde_json = { workspace = true }
[features] [features]
default = ["cloud"] default = ["cloud"]

32
tvix/cli/Cargo.toml
View file

@ -15,25 +15,23 @@ tvix-store = { path = "../store", default-features = false, features = []}
tvix-eval = { path = "../eval" } tvix-eval = { path = "../eval" }
tvix-glue = { path = "../glue" } tvix-glue = { path = "../glue" }
tvix-tracing = { path = "../tracing" } tvix-tracing = { path = "../tracing" }
bytes = "1.7.1" bytes = { workspace = true }
clap = { version = "4.5", features = ["derive", "env"] } clap = { workspace = true, features = ["derive", "env"] }
dirs = "4.0.0" dirs = { workspace = true }
rustyline = "10.1.1" rustyline = { workspace = true }
rnix = "0.11.0" rnix = { workspace = true }
rowan = "*" rowan = { workspace = true }
smol_str = "0.2.2" smol_str = { workspace = true }
thiserror = "1.0.63" thiserror = { workspace = true }
tokio = "1.39.3" tokio = { workspace = true }
tracing = "0.1.40" tracing = { workspace = true }
tracing-indicatif = "0.3.6" tracing-indicatif = { workspace = true }
rustc-hash = "2.0.0" rustc-hash = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
wu-manber = { workspace = true }
[dependencies.wu-manber]
git = "https://github.com/tvlfyi/wu-manber.git"
[dev-dependencies] [dev-dependencies]
expect-test = "1.5.0" expect-test = { workspace = true }
[features] [features]
default = [] default = []

66
tvix/eval/Cargo.toml
View file

@ -8,42 +8,42 @@ name = "tvix_eval"
[dependencies] [dependencies]
builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" } builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" }
bytes = "1.7.1" bytes = { workspace = true }
bstr = { version = "1.10.0", features = ["serde"] } bstr = { workspace = true, features = ["serde"] }
codemap = "0.1.3" codemap = { workspace = true }
codemap-diagnostic = "0.1.2" codemap-diagnostic = { workspace = true }
dirs = "4.0.0" dirs = { workspace = true }
genawaiter = { version = "0.99.1", default-features = false } genawaiter = { workspace = true }
itertools = "0.12.1" itertools = { workspace = true }
lazy_static = "1.5.0" lazy_static = { workspace = true }
lexical-core = { version = "0.8.5", features = ["format", "parse-floats"] } lexical-core = { workspace = true, features = ["format", "parse-floats"] }
os_str_bytes = { version = "6.6", features = ["conversions"] } os_str_bytes = { workspace = true, features = ["conversions"] }
path-clean = "0.1" path-clean = { workspace = true }
proptest = { version = "1.5.0", default-features = false, features = ["std", "alloc", "tempfile"], optional = true } proptest = { workspace = true, features = ["std", "alloc", "tempfile"], optional = true }
regex = "1.10.6" regex = { workspace = true }
rnix = "0.11.0" rnix = { workspace = true }
rowan = "*" # pinned by rnix rowan = { workspace = true } # pinned by rnix
serde = { version = "1.0", features = [ "rc", "derive" ] } serde = { workspace = true, features = ["rc", "derive"] }
serde_json = "1.0" serde_json = { workspace = true }
smol_str = "0.2.2" smol_str = { workspace = true }
tabwriter = "1.4" tabwriter = { workspace = true }
test-strategy = { version = "0.2.1", optional = true } test-strategy = { workspace = true, optional = true }
toml = "0.6.0" toml = "0.6.0"
sha2 = "0.10.8" sha2 = { workspace = true }
sha1 = "0.10.6" sha1 = { workspace = true }
md-5 = "0.10.6" md-5 = { workspace = true }
data-encoding = "2.6.0" data-encoding = { workspace = true }
rustc-hash = "2.0.0" rustc-hash = { workspace = true }
nohash-hasher = "0.2.0" nohash-hasher = { workspace = true }
vu128 = "1.1.0" vu128 = { workspace = true }
[dev-dependencies] [dev-dependencies]
criterion = "0.5" criterion = { workspace = true }
itertools = "0.12.1" itertools = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
pretty_assertions = "1.4.0" pretty_assertions = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
tempfile = "3.12.0" tempfile = { workspace = true }
[features] [features]
default = ["impure", "arbitrary", "nix_tests"] default = ["impure", "arbitrary", "nix_tests"]

4
tvix/eval/builtin-macros/Cargo.toml
View file

@ -6,8 +6,8 @@ edition = "2021"
[dependencies] [dependencies]
syn = { version = "1.0.109", features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] } syn = { version = "1.0.109", features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] }
quote = "1.0.37" quote = { workspace = true }
proc-macro2 = "1" proc-macro2 = { workspace = true }
[lib] [lib]
proc-macro = true proc-macro = true

66
tvix/glue/Cargo.toml
View file

@ -4,48 +4,46 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
async-compression = { version = "0.4.12", features = ["tokio", "gzip", "bzip2", "xz"]} async-compression = { workspace = true, features = ["tokio", "gzip", "bzip2", "xz"] }
bstr = "1.10.0" bstr = { workspace = true }
bytes = "1.7.1" bytes = { workspace = true }
data-encoding = "2.6.0" data-encoding = { workspace = true }
futures = "0.3.30" futures = { workspace = true }
magic = "0.16.2" magic = { workspace = true }
nix-compat = { path = "../nix-compat" } nix-compat = { path = "../nix-compat" }
pin-project = "1.1" pin-project = { workspace = true }
reqwest = { version = "0.12.7", features = ["rustls-tls-native-roots"], default-features = false } reqwest = { workspace = true, features = ["rustls-tls-native-roots"] }
tvix-build = { path = "../build", default-features = false, features = []} tvix-build = { path = "../build", default-features = false, features = []}
tvix-eval = { path = "../eval" } tvix-eval = { path = "../eval" }
tvix-castore = { path = "../castore" } tvix-castore = { path = "../castore" }
tvix-store = { path = "../store", default-features = false, features = []} tvix-store = { path = "../store", default-features = false, features = []}
tvix-tracing = { path = "../tracing" } tvix-tracing = { path = "../tracing" }
tracing = "0.1.40" tracing = { workspace = true }
tracing-indicatif = "0.3.6" tracing-indicatif = { workspace = true }
tokio = "1.39.3" tokio = { workspace = true }
tokio-tar = "0.3.1" tokio-tar = { workspace = true }
tokio-util = { version = "0.7.11", features = ["io", "io-util", "compat"] } tokio-util = { workspace = true, features = ["io", "io-util", "compat"] }
thiserror = "1.0.63" thiserror = { workspace = true }
serde = "1.0.209" serde = { workspace = true }
serde_json = "1.0" serde_json = { workspace = true }
sha2 = "0.10.8" sha2 = { workspace = true }
sha1 = "0.10.6" sha1 = { workspace = true }
md-5 = "0.10.6" md-5 = { workspace = true }
url = "2.5.2" url = { workspace = true }
walkdir = "2.5.0" walkdir = { workspace = true }
clap = { version = "4.5.16", default-features = false } clap = { workspace = true }
wu-manber = { workspace = true }
[dependencies.wu-manber]
git = "https://github.com/tvlfyi/wu-manber.git"
[dev-dependencies] [dev-dependencies]
criterion = { version = "0.5", features = ["html_reports"] } criterion = { workspace = true, features = ["html_reports"] }
hex-literal = "0.4.1" hex-literal = { workspace = true }
lazy_static = "1.5.0" lazy_static = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
nix = { version = "0.27.1", features = [ "fs" ] } nix = { workspace = true, features = ["fs"] }
pretty_assertions = "1.4.0" pretty_assertions = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
tempfile = "3.12.0" tempfile = { workspace = true }
tokio-test = "0.4.4" tokio-test = { workspace = true }
[features] [features]
default = ["nix_tests"] default = ["nix_tests"]

50
tvix/nar-bridge/Cargo.toml
View file

@ -4,43 +4,43 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
axum = { version = "0.7.5", features = ["http2"] } axum = { workspace = true, features = ["http2"] }
tower = "0.4.13" tower = { workspace = true }
tower-http = { version = "0.5", features = ["trace"] } tower-http = { workspace = true, features = ["trace"] }
bytes = "1.7.1" bytes = { workspace = true }
clap = { version = "4.5", features = ["derive", "env"] } clap = { workspace = true, features = ["derive", "env"] }
data-encoding = "2.6.0" data-encoding = { workspace = true }
futures = "0.3.30" futures = { workspace = true }
itertools = "0.12.1" itertools = { workspace = true }
prost = "0.13.1" prost = { workspace = true }
nix-compat = { path = "../nix-compat", features = ["async"] } nix-compat = { path = "../nix-compat", features = ["async"] }
thiserror = "1.0.63" thiserror = { workspace = true }
tokio = { version = "1.39.3" } tokio = { workspace = true }
tokio-listener = { version = "0.4.3", features = [ "axum07", "clap", "multi-listener", "sd_listen" ] } tokio-listener = { workspace = true, features = ["axum07", "clap", "multi-listener", "sd_listen"] }
tokio-util = { version = "0.7.11", features = ["io", "io-util", "compat"] } tokio-util = { workspace = true, features = ["io", "io-util", "compat"] }
tonic = { version = "0.12.2", features = ["tls", "tls-roots"] } tonic = { workspace = true, features = ["tls", "tls-roots"] }
tvix-castore = { path = "../castore" } tvix-castore = { path = "../castore" }
tvix-store = { path = "../store" } tvix-store = { path = "../store" }
tvix-tracing = { path = "../tracing", features = ["tonic", "axum"] } tvix-tracing = { path = "../tracing", features = ["tonic", "axum"] }
tracing = "0.1.40" tracing = { workspace = true }
tracing-subscriber = "0.3.18" tracing-subscriber = { workspace = true }
url = "2.5.2" url = { workspace = true }
serde = { version = "1.0.209", features = ["derive"] } serde = { workspace = true, features = ["derive"] }
lru = "0.12.4" lru = { workspace = true }
parking_lot = "0.12.3" parking_lot = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
[build-dependencies] [build-dependencies]
prost-build = "0.13.1" prost-build = { workspace = true }
tonic-build = "0.12.2" tonic-build = { workspace = true }
[features] [features]
default = ["otlp"] default = ["otlp"]
otlp = ["tvix-tracing/otlp"] otlp = ["tvix-tracing/otlp"]
[dev-dependencies] [dev-dependencies]
hex-literal = "0.4.1" hex-literal = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
[lints] [lints]
workspace = true workspace = true

15
tvix/nix-compat-derive-tests/Cargo.toml
View file

@ -7,11 +7,12 @@ edition = "2021"
compile-tests = [] compile-tests = []
[dev-dependencies] [dev-dependencies]
hex-literal = "0.4.1" hex-literal = { workspace = true }
pretty_assertions = "1.4.0" pretty_assertions = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
tokio-test = "0.4.4" tokio-test = { workspace = true }
trybuild = "1.0.99" trybuild = { workspace = true }
tokio = { workspace = true, features = ["io-util", "macros"] }
[dev-dependencies.nix-compat] [dev-dependencies.nix-compat]
version = "0.1.0" version = "0.1.0"
@ -21,7 +22,3 @@ features = ["test", "wire"]
[dev-dependencies.nix-compat-derive] [dev-dependencies.nix-compat-derive]
version = "0.1.0" version = "0.1.0"
path = "../nix-compat-derive" path = "../nix-compat-derive"
[dev-dependencies.tokio]
version = "^1.39"
features = ["io-util", "macros"]

17
tvix/nix-compat-derive/Cargo.toml
View file

@ -7,19 +7,16 @@ edition = "2021"
proc-macro = true proc-macro = true
[dependencies] [dependencies]
proc-macro2 = { version = "1.0.86", features = ["proc-macro"] } proc-macro2 = { workspace = true, features = ["proc-macro"] }
quote = { version = "1.0.37", features = ["proc-macro"] } quote = { workspace = true, features = ["proc-macro"] }
syn = { version = "2.0.76", features = ["full", "extra-traits"] } syn = { version = "2.0.76", features = ["full", "extra-traits"] }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.4.1" hex-literal = { workspace = true }
pretty_assertions = "1.4.0" pretty_assertions = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
tokio-test = "0.4.4" tokio-test = { workspace = true }
tokio = { workspace = true, features = ["io-util", "macros"] }
[dev-dependencies.tokio]
version = "^1.39"
features = ["io-util", "macros"]
[dev-dependencies.nix-compat] [dev-dependencies.nix-compat]
path = "../nix-compat" path = "../nix-compat"

68
tvix/nix-compat/Cargo.toml
View file

@ -14,51 +14,41 @@ test = []
default = ["async", "wire", "nix-compat-derive"] default = ["async", "wire", "nix-compat-derive"]
[dependencies] [dependencies]
bitflags = "2.6.0" bitflags = { workspace = true }
bstr = { version = "1.10.0", features = ["alloc", "unicode", "serde"] } bstr = { workspace = true, features = ["alloc", "unicode", "serde"] }
data-encoding = "2.6.0" data-encoding = { workspace = true }
ed25519 = "2.2.3" ed25519 = { workspace = true }
ed25519-dalek = "2.1.1" ed25519-dalek = { workspace = true }
enum-primitive-derive = "0.3.0" enum-primitive-derive = { workspace = true }
glob = "0.3.1" glob = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
nom = "7.1.3" nom = { workspace = true }
num-traits = "0.2.19" num-traits = { workspace = true }
serde = { version = "1.0", features = ["derive"] } serde = { workspace = true, features = ["derive"] }
serde_json = "1.0" serde_json = { workspace = true }
sha2 = "0.10.8" sha2 = { workspace = true }
thiserror = "1.0.63" thiserror = { workspace = true }
tracing = "0.1.40" tracing = { workspace = true }
bytes = { workspace = true, optional = true }
[dependencies.bytes] tokio = { workspace = true, features = ["io-util", "macros"], optional = true }
optional = true pin-project-lite = { workspace = true, optional = true }
version = "1.7.1"
[dependencies.nix-compat-derive] [dependencies.nix-compat-derive]
path = "../nix-compat-derive" path = "../nix-compat-derive"
optional = true optional = true
[dependencies.tokio]
optional = true
version = "1.39.3"
features = ["io-util", "macros"]
[dependencies.pin-project-lite]
optional = true
version = "0.2.14"
[dev-dependencies] [dev-dependencies]
criterion = { version = "0.5", features = ["html_reports"] } criterion = { workspace = true, features = ["html_reports"] }
futures = { version = "0.3.30", default-features = false, features = ["executor"] } futures = { workspace = true, features = ["executor"] }
hex-literal = "0.4.1" hex-literal = { workspace = true }
lazy_static = "1.5.0" lazy_static = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
pretty_assertions = "1.4.0" pretty_assertions = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
serde_json = "1.0" serde_json = { workspace = true }
smol_str = "0.2.2" smol_str = { workspace = true }
tokio-test = "0.4.4" tokio-test = { workspace = true }
zstd = "^0.13.2" zstd = { workspace = true }
[[bench]] [[bench]]
name = "derivation_parse_aterm" name = "derivation_parse_aterm"

4
tvix/serde/Cargo.toml
View file

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
tvix-eval = { path = "../eval" } tvix-eval = { path = "../eval" }
serde = { version = "1.0", features = ["derive"] } serde = { workspace = true, features = ["derive"] }
bstr = { version = "1.10.0", features = ["serde"] } bstr = { workspace = true, features = ["serde"] }

104
tvix/store/Cargo.toml
View file

@ -4,70 +4,62 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
anyhow = "1.0.86" anyhow = { workspace = true }
async-compression = { version = "0.4.12", features = ["tokio", "bzip2", "gzip", "xz", "zstd"]} async-compression = { workspace = true, features = ["tokio", "bzip2", "gzip", "xz", "zstd"] }
async-stream = "0.3.5" async-stream = { workspace = true }
blake3 = { version = "1.5.4", features = ["rayon", "std"] } blake3 = { workspace = true, features = ["rayon", "std"] }
bstr = "1.10.0" bstr = { workspace = true }
bytes = "1.7.1" bytes = { workspace = true }
clap = { version = "4.5", features = ["derive", "env"] } clap = { workspace = true, features = ["derive", "env"] }
count-write = "0.1.0" count-write = { workspace = true }
data-encoding = "2.6.0" data-encoding = { workspace = true }
futures = "0.3.30" futures = { workspace = true }
lazy_static = "1.5.0" lazy_static = { workspace = true }
nix-compat = { path = "../nix-compat", features = ["async"] } nix-compat = { path = "../nix-compat", features = ["async"] }
pin-project-lite = "0.2.14" pin-project-lite = { workspace = true }
prost = "0.13.1" prost = { workspace = true }
serde = { version = "1.0.209", features = [ "derive" ] } serde = { workspace = true, features = ["derive"] }
serde_json = "1.0" serde_json = { workspace = true }
serde_with = "3.9.0" serde_with = { workspace = true }
serde_qs = "0.12.0" serde_qs = { workspace = true }
sha2 = "0.10.8" sha2 = { workspace = true }
sled = { version = "0.34.7" } sled = { workspace = true }
thiserror = "1.0.63" thiserror = { workspace = true }
tokio = { version = "1.39.3", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } tokio = { workspace = true, features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] }
tokio-listener = { version = "0.4.3", features = [ "clap", "multi-listener", "sd_listen", "tonic012" ] } tokio-listener = { workspace = true, features = ["clap", "multi-listener", "sd_listen", "tonic012"] }
tokio-stream = { version = "0.1.15", features = ["fs"] } tokio-stream = { workspace = true, features = ["fs"] }
tokio-util = { version = "0.7.11", features = ["io", "io-util", "compat"] } tokio-util = { workspace = true, features = ["io", "io-util", "compat"] }
tonic = { version = "0.12.2", features = ["tls", "tls-roots"] } tonic = { workspace = true, features = ["tls", "tls-roots"] }
tower = "0.4.13" tower = { workspace = true }
tower-http = { version = "0.5.2", features = ["trace"] } tower-http = { workspace = true, features = ["trace"] }
tvix-castore = { path = "../castore" } tvix-castore = { path = "../castore" }
url = "2.5.2" url = { workspace = true }
walkdir = "2.5.0" walkdir = { workspace = true }
reqwest = { version = "0.12.7", features = ["rustls-tls-native-roots", "stream"], default-features = false } reqwest = { workspace = true, features = ["rustls-tls-native-roots", "stream"] }
reqwest-middleware = "0.3.3" reqwest-middleware = { workspace = true }
lru = "0.12.4" lru = { workspace = true }
parking_lot = "0.12.3" parking_lot = { workspace = true }
tvix-tracing = { path = "../tracing", features = ["tonic", "reqwest"] } tvix-tracing = { path = "../tracing", features = ["tonic", "reqwest"] }
tracing = "0.1.40" tracing = { workspace = true }
tracing-indicatif = "0.3.6" tracing-indicatif = { workspace = true }
hyper-util = "0.1.7" hyper-util = { workspace = true }
toml = { version = "0.8.19", optional = true } toml = { version = "0.8.19", optional = true }
tonic-health = { version = "0.12.2", default-features = false } tonic-health = { workspace = true }
redb = "2.1.2" redb = { workspace = true }
mimalloc = "0.1.43" mimalloc = { workspace = true }
tonic-reflection = { workspace = true, optional = true }
[dependencies.tonic-reflection] bigtable_rs = { workspace = true, optional = true }
optional = true
version = "0.12.2"
[dependencies.bigtable_rs]
optional = true
# https://github.com/liufuyang/bigtable_rs/pull/86
git = "https://github.com/liufuyang/bigtable_rs"
rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef"
[build-dependencies] [build-dependencies]
prost-build = "0.13.1" prost-build = { workspace = true }
tonic-build = "0.12.2" tonic-build = { workspace = true }
[dev-dependencies] [dev-dependencies]
async-process = "2.2.4" async-process = { workspace = true }
rstest = "0.19.0" rstest = { workspace = true }
rstest_reuse = "0.6.0" rstest_reuse = { workspace = true }
tempfile = "3.12.0" tempfile = { workspace = true }
tokio-retry = "0.3.0" tokio-retry = { workspace = true }
[features] [features]
default = ["cloud", "fuse", "otlp", "tonic-reflection"] default = ["cloud", "fuse", "otlp", "tonic-reflection"]

34
tvix/tracing/Cargo.toml
View file

@ -4,27 +4,27 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
lazy_static = "1.5.0" lazy_static = { workspace = true }
tracing = { version = "0.1.40", features = ["max_level_trace", "release_max_level_debug"] } tracing = { workspace = true, features = ["max_level_trace", "release_max_level_debug"] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-subscriber = { workspace = true, features = ["env-filter"] }
indicatif = "0.17.8" indicatif = { workspace = true }
tracing-indicatif = "0.3.6" tracing-indicatif = { workspace = true }
tokio = { version = "1.39.3" , features = ["sync", "rt"] } tokio = { workspace = true, features = ["sync", "rt"] }
thiserror = "1.0.63" thiserror = { workspace = true }
tracing-opentelemetry = { version = "0.25.0", optional = true } tracing-opentelemetry = { workspace = true, optional = true }
opentelemetry = { version = "0.24.0", optional = true } opentelemetry = { workspace = true, optional = true }
opentelemetry-otlp = { version = "0.17.0", optional = true } opentelemetry-otlp = { workspace = true, optional = true }
opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"], optional = true } opentelemetry_sdk = { workspace = true, features = ["rt-tokio"], optional = true }
tracing-tracy = { version = "0.11.2", features = ["flush-on-exit"], optional = true } tracing-tracy = { workspace = true, features = ["flush-on-exit"], optional = true }
opentelemetry-http = { version = "0.13.0", optional = true } opentelemetry-http = { workspace = true, optional = true }
tonic = { version = "0.12.2", optional = true } tonic = { workspace = true, optional = true }
http = { version = "1.1.0", optional = true } http = { workspace = true, optional = true }
reqwest-tracing = { version = "0.5.3", default-features = false, optional = true } reqwest-tracing = { workspace = true, optional = true }
axum = { version = "0.7.5", optional = true } axum = { workspace = true, optional = true }
[features] [features]
default = [] default = []