diff --git a/backend/Cargo.lock b/backend/Cargo.lock index b1dabfd857..2e56ae93e6 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -559,6 +559,22 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "astral-tokio-tar" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5" +dependencies = [ + "filetime", + "futures-core", + "libc", + "portable-atomic", + "rustc-hash 2.1.1", + "tokio", + "tokio-stream", + "xattr", +] + [[package]] name = "async-broadcast" version = "0.7.2" @@ -5368,9 +5384,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flatbuffers" -version = "25.9.23" +version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b6620799e7340ebd9968d2e0708eb82cf1971e9a16821e2091b6d6e475eed5" +checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ "bitflags 2.9.4", "rustc_version 0.4.1", @@ -8623,9 +8639,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081" dependencies = [ "winapi", ] @@ -10552,15 +10568,6 @@ dependencies = [ "syn 2.0.111", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.18" @@ -13825,21 +13832,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - [[package]] name = "tokio-tungstenite" version = "0.24.0" @@ -15241,6 +15233,7 @@ version = "1.595.0" dependencies = [ "anyhow", "argon2", + "astral-tokio-tar", "async-nats", "async-oauth2", "async-recursion", @@ -15331,7 +15324,6 @@ dependencies = [ "tokio-postgres 0.7.11", "tokio-postgres 0.7.13", "tokio-stream", - "tokio-tar", "tokio-tungstenite", "tokio-util", "tonic", @@ -15521,6 +15513,7 @@ name = "windmill-indexer" version = "1.595.0" dependencies = [ "anyhow", + "astral-tokio-tar", "bytes", "chrono", "const_format", @@ -15534,7 +15527,6 @@ dependencies = [ "tantivy", "tempfile", "tokio", - "tokio-tar", "tracing", "uuid", "windmill-common", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 844a085771..df0f7be024 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -260,7 +260,7 @@ reqwest = { version = "=0.12.24", features = ["json", "stream", "gzip", "multipa eventsource-stream = "0.2.3" time = "^0" serde_urlencoded = "^0" -tokio-tar = "^0" +astral-tokio-tar = "^0.5.6" tempfile = "^3" tokio-util = { version = "^0", features = ["io"] } json-pointer = "^0" diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml index 133a895fcf..78ff288a1c 100644 --- a/backend/windmill-api/Cargo.toml +++ b/backend/windmill-api/Cargo.toml @@ -92,7 +92,7 @@ mail-parser = { workspace = true, features = ["serde_support"], optional = true magic-crypt.workspace = true tempfile.workspace = true tokio-util.workspace = true -tokio-tar.workspace = true +astral-tokio-tar.workspace = true tokio-postgres.workspace = true postgres-native-tls.workspace = true hmac.workspace = true diff --git a/backend/windmill-indexer/Cargo.toml b/backend/windmill-indexer/Cargo.toml index 800fe46835..fa183b18f5 100644 --- a/backend/windmill-indexer/Cargo.toml +++ b/backend/windmill-indexer/Cargo.toml @@ -29,7 +29,7 @@ futures.workspace = true tempfile.workspace = true bytes.workspace = true object_store = { workspace = true, optional = true} -tokio-tar.workspace = true +astral-tokio-tar.workspace = true lazy_static.workspace = true const_format.workspace = true flume.workspace = true