From 1ff89263cfd1aae98b19f9d844bd815feb5fa7a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 04:35:39 +0000 Subject: [PATCH] tabby: 0.20.0 -> 0.22.0 --- pkgs/by-name/ta/tabby/Cargo.lock | 321 +++++++++++++++++++++++------- pkgs/by-name/ta/tabby/package.nix | 4 +- 2 files changed, 251 insertions(+), 74 deletions(-) diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index 0866c3a0bd3e..2ea6f16ddb2d 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/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" @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.20.0" +version = "0.22.0" dependencies = [ "async-stream", "clap", @@ -201,7 +201,7 @@ dependencies = [ "rand 0.8.5", "reqwest", "reqwest-eventsource", - "secrecy", + "secrecy 0.8.0", "serde", "serde_json", "thiserror", @@ -308,7 +308,7 @@ dependencies = [ "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -352,7 +352,7 @@ dependencies = [ "mime", "pin-project-lite", "serde", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -376,8 +376,8 @@ dependencies = [ "once_cell", "pin-project", "tokio", - "tower", - "tower-http", + "tower 0.4.13", + "tower-http 0.5.2", ] [[package]] @@ -444,9 +444,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -637,6 +637,17 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +[[package]] +name = "clocksource" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129026dd5a8a9592d96916258f3a5379589e513ea5e86aeb0bd2530286e44e9e" +dependencies = [ + "libc", + "time", + "winapi", +] + [[package]] name = "cmake" version = "0.1.50" @@ -728,10 +739,20 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "core-foundation" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -1291,6 +1312,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "futf" version = "0.1.5" @@ -1475,7 +1506,7 @@ version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -1691,7 +1722,7 @@ dependencies = [ [[package]] name = "hash-ids" -version = "0.20.0" +version = "0.22.0" [[package]] name = "hashbrown" @@ -1875,13 +1906,14 @@ dependencies = [ [[package]] name = "http-api-bindings" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-openai", "async-stream", "async-trait", "futures", + "leaky-bucket", "ollama-api-bindings", "reqwest", "reqwest-eventsource", @@ -1890,6 +1922,7 @@ dependencies = [ "tabby-common", "tabby-inference", "tokio", + "tracing", ] [[package]] @@ -1998,12 +2031,29 @@ dependencies = [ "http 1.1.0", "hyper 1.3.1", "hyper-util", - "log", - "rustls", - "rustls-native-certs", + "rustls 0.22.4", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", + "tower-service", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "log", + "rustls 0.23.20", + "rustls-native-certs 0.8.1", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.1", "tower-service", ] @@ -2051,7 +2101,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2353,6 +2403,17 @@ dependencies = [ "spin 0.5.2", ] +[[package]] +name = "leaky-bucket" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5" +dependencies = [ + "parking_lot", + "pin-project-lite", + "tokio", +] + [[package]] name = "lettre" version = "0.11.7" @@ -2538,7 +2599,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llama-cpp-server" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-openai", @@ -2832,7 +2893,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.0", "security-framework-sys", "tempfile", ] @@ -3027,9 +3088,9 @@ dependencies = [ [[package]] name = "octocrab" -version = "0.38.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367" +checksum = "7b97f949a7cb04608441c2ddb28e15a377e8b5142c2d1835ad2686d434de8558" dependencies = [ "arc-swap", "async-trait", @@ -3044,29 +3105,30 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-rustls", + "hyper-rustls 0.27.3", "hyper-timeout", "hyper-util", "jsonwebtoken", "once_cell", "percent-encoding", "pin-project", - "secrecy", + "secrecy 0.10.3", "serde", "serde_json", "serde_path_to_error", "serde_urlencoded", "snafu", "tokio", - "tower", - "tower-http", + "tower 0.5.2", + "tower-http 0.6.2", "tracing", "url", + "web-time", ] [[package]] name = "ollama-api-bindings" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-stream", @@ -3123,7 +3185,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -3729,13 +3791,24 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "ratelimit" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36ea961700fd7260e7fa3701c8287d901b2172c51f9c1421fa0f21d7f7e184b7" +dependencies = [ + "clocksource", + "parking_lot", + "thiserror", +] + [[package]] name = "raw-cpuid" version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3787,7 +3860,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3871,7 +3944,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", - "hyper-rustls", + "hyper-rustls 0.26.0", "hyper-tls", "hyper-util", "ipnet", @@ -3883,8 +3956,8 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-native-certs", + "rustls 0.22.4", + "rustls-native-certs 0.7.0", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3894,7 +3967,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tower-service", "url", @@ -4050,7 +4123,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -4071,6 +4144,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -4081,7 +4169,19 @@ dependencies = [ "rustls-pemfile", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 2.11.0", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework 3.0.1", ] [[package]] @@ -4096,15 +4196,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -4178,14 +4278,36 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secrecy" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -4193,9 +4315,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -4332,6 +4454,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" dependencies = [ + "fslock", "futures", "log", "once_cell", @@ -4682,7 +4805,7 @@ source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "bytes", "chrono", @@ -4724,7 +4847,7 @@ source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "chrono", "crc", @@ -4964,7 +5087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -4980,7 +5103,7 @@ dependencies = [ [[package]] name = "tabby" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "assert-json-diff", @@ -5020,7 +5143,7 @@ dependencies = [ "tantivy", "thiserror", "tokio", - "tower-http", + "tower-http 0.5.2", "tracing", "tracing-subscriber", "utoipa", @@ -5031,7 +5154,7 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5059,7 +5182,7 @@ dependencies = [ [[package]] name = "tabby-crawler" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-stream", @@ -5078,7 +5201,7 @@ dependencies = [ [[package]] name = "tabby-db" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "assert_matches", @@ -5096,7 +5219,7 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.20.0" +version = "0.22.0" dependencies = [ "quote", "syn 2.0.66", @@ -5104,7 +5227,7 @@ dependencies = [ [[package]] name = "tabby-download" -version = "0.20.0" +version = "0.22.0" dependencies = [ "aim-downloader", "anyhow", @@ -5116,7 +5239,7 @@ dependencies = [ [[package]] name = "tabby-git" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "assert_matches", @@ -5137,7 +5260,7 @@ dependencies = [ [[package]] name = "tabby-index" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-stream", @@ -5179,7 +5302,7 @@ dependencies = [ [[package]] name = "tabby-index-cli" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "clap", @@ -5191,7 +5314,7 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-openai", @@ -5201,7 +5324,7 @@ dependencies = [ "derive_builder", "futures", "reqwest", - "secrecy", + "secrecy 0.8.0", "tabby-common", "tracing", "trie-rs", @@ -5209,7 +5332,7 @@ dependencies = [ [[package]] name = "tabby-schema" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "async-openai", @@ -5236,7 +5359,7 @@ dependencies = [ [[package]] name = "tabby-webserver" -version = "0.20.0" +version = "0.22.0" dependencies = [ "anyhow", "argon2", @@ -5247,6 +5370,7 @@ dependencies = [ "axum", "axum-extra", "bincode", + "cached", "chrono", "cron", "fs_extra", @@ -5265,6 +5389,7 @@ dependencies = [ "octocrab", "pin-project", "querystring", + "ratelimit", "reqwest", "rust-embed", "serde", @@ -5653,11 +5778,21 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +dependencies = [ + "rustls 0.23.20", + "tokio", +] + [[package]] name = "tokio-serde" version = "0.8.0" @@ -5755,6 +5890,22 @@ dependencies = [ "pin-project", "pin-project-lite", "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 1.0.1", + "tokio", "tokio-util", "tower-layer", "tower-service", @@ -5767,16 +5918,31 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "bytes", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +dependencies = [ + "bitflags 2.6.0", "bytes", "futures-util", "http 1.1.0", "http-body 1.0.0", - "http-body-util", "iri-string", "pin-project-lite", - "tokio", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -5784,15 +5950,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -6498,6 +6664,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.26.3" diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index c8635f87d0b3..cc90c9be65dc 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -31,7 +31,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.20.0"; + version = "0.22.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -120,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "refs/tags/v${version}"; - hash = "sha256-Vhl5oNVYY3pizoA0PuV4c9UXH3F2L+WiXQMOM0Pqxks="; + hash = "sha256-fzbJjoBJ6zOw1ABN9PitbW2usm4NgqVfMWSAvRAVHj0="; fetchSubmodules = true; };