diff options
author | Gaetan Lepage <gaetan@glepage.com> | 2024-05-23 08:29:01 +0200 |
---|---|---|
committer | Gaetan Lepage <gaetan@glepage.com> | 2024-05-25 15:56:13 +0200 |
commit | 5e8eb425752a7abddb22093c5af40cc1890946de (patch) | |
tree | 1abadf9e143ecbabceab927c94daf888b038a9e2 /pkgs/by-name/ze | |
parent | aa84310b9b356760b4d3b0a7387cdaf2d2ca22c7 (diff) |
zed-editor: 0.135.2 -> 0.136.2
Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.135.2...0.136.2 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.136.2
Diffstat (limited to 'pkgs/by-name/ze')
-rw-r--r-- | pkgs/by-name/ze/zed-editor/Cargo.lock | 454 | ||||
-rw-r--r-- | pkgs/by-name/ze/zed-editor/package.nix | 16 |
2 files changed, 324 insertions, 146 deletions
diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 707a06a3bb611..3aadb811b9a0e 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -224,10 +224,12 @@ version = "0.1.0" dependencies = [ "anyhow", "futures 0.3.28", + "http 0.1.0", + "isahc", + "schemars", "serde", "serde_json", "tokio", - "util", ] [[package]] @@ -238,9 +240,9 @@ checksum = "e78f17bacc1bc7b91fef7b1885c10772eb2b9e4e989356f6f0f6a972240f97cd" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "approx" @@ -332,7 +334,9 @@ dependencies = [ name = "assistant" version = "0.1.0" dependencies = [ + "anthropic", "anyhow", + "cargo_toml", "chrono", "client", "collections", @@ -344,6 +348,7 @@ dependencies = [ "fs", "futures 0.3.28", "gpui", + "http 0.1.0", "indoc", "language", "log", @@ -364,6 +369,7 @@ dependencies = [ "telemetry_events", "theme", "tiktoken-rs", + "toml 0.8.10", "ui", "util", "uuid", @@ -377,26 +383,29 @@ dependencies = [ "anyhow", "assets", "assistant_tooling", + "chrono", "client", "collections", "editor", "env_logger", "feature_flags", + "file_icons", "fs", "futures 0.3.28", "fuzzy", "gpui", + "http 0.1.0", "language", "languages", "log", - "nanoid", + "markdown", "node_runtime", "open_ai", "picker", "project", "rand 0.8.5", + "regex", "release_channel", - "rich_text", "schemars", "semantic_index", "serde", @@ -405,6 +414,7 @@ dependencies = [ "story", "theme", "ui", + "unindent", "util", "workspace", ] @@ -417,12 +427,15 @@ dependencies = [ "collections", "futures 0.3.28", "gpui", + "log", "project", + "repair_json", "schemars", "serde", "serde_json", "settings", "sum_tree", + "ui", "unindent", "util", ] @@ -482,6 +495,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ + "deflate64", "flate2", "futures-core", "futures-io", @@ -613,6 +627,18 @@ dependencies = [ ] [[package]] +name = "async-native-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec" +dependencies = [ + "futures-util", + "native-tls", + "thiserror", + "url", +] + +[[package]] name = "async-net" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -806,7 +832,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5682ea0913e5c20780fe5785abacb85a411e7437bf52a1bedb93ddb3972cb8dd" dependencies = [ - "async-native-tls", + "async-native-tls 0.3.3", "async-std", "futures-io", "futures-util", @@ -816,6 +842,19 @@ dependencies = [ ] [[package]] +name = "async_zip" +version = "0.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52" +dependencies = [ + "async-compression", + "crc32fast", + "futures-lite 2.2.0", + "pin-project", + "thiserror", +] + +[[package]] name = "atoi" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -869,6 +908,7 @@ dependencies = [ "db", "editor", "gpui", + "http 0.1.0", "isahc", "log", "markdown_preview", @@ -914,7 +954,7 @@ dependencies = [ "hex", "http 0.2.9", "hyper", - "ring 0.17.7", + "ring", "time", "tokio", "tracing", @@ -1074,7 +1114,7 @@ dependencies = [ "once_cell", "p256", "percent-encoding", - "ring 0.17.7", + "ring", "sha2 0.10.7", "subtle", "time", @@ -1261,7 +1301,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.4", + "base64 0.21.7", "bitflags 1.3.2", "bytes 1.5.0", "futures-util", @@ -1356,9 +1396,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" @@ -1490,7 +1530,7 @@ dependencies = [ [[package]] name = "blade-graphics" version = "0.4.0" -source = "git+https://github.com/kvark/blade?rev=f5766863de9dcc092e90fdbbc5e0007a99e7f9bf#f5766863de9dcc092e90fdbbc5e0007a99e7f9bf" +source = "git+https://github.com/kvark/blade?rev=e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c#e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" dependencies = [ "ash", "ash-window", @@ -1520,7 +1560,7 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.2.1" -source = "git+https://github.com/kvark/blade?rev=f5766863de9dcc092e90fdbbc5e0007a99e7f9bf#f5766863de9dcc092e90fdbbc5e0007a99e7f9bf" +source = "git+https://github.com/kvark/blade?rev=e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c#e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" dependencies = [ "proc-macro2", "quote", @@ -1736,6 +1776,7 @@ dependencies = [ "fs", "futures 0.3.28", "gpui", + "http 0.1.0", "language", "live_kit_client", "log", @@ -1852,6 +1893,16 @@ dependencies = [ ] [[package]] +name = "cargo_toml" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8cb1d556b8b8f36e5ca74938008be3ac102f5dcb5b68a0477e4249ae2291cd3" +dependencies = [ + "serde", + "toml 0.8.10", +] + +[[package]] name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1938,6 +1989,7 @@ dependencies = [ "collections", "futures 0.3.28", "gpui", + "http 0.1.0", "language", "log", "rand 0.8.5", @@ -2101,7 +2153,11 @@ dependencies = [ "clap 4.4.4", "core-foundation", "core-services", + "exec", + "fork", "ipc-channel", + "libc", + "once_cell", "plist", "release_channel", "serde", @@ -2156,6 +2212,7 @@ name = "client" version = "0.1.0" dependencies = [ "anyhow", + "async-native-tls 0.5.0", "async-recursion 0.3.2", "async-tungstenite", "chrono", @@ -2164,6 +2221,7 @@ dependencies = [ "feature_flags", "futures 0.3.28", "gpui", + "http 0.1.0", "lazy_static", "log", "once_cell", @@ -2294,6 +2352,7 @@ dependencies = [ "gpui", "headless", "hex", + "http 0.1.0", "indoc", "language", "live_kit_client", @@ -2301,6 +2360,7 @@ dependencies = [ "log", "lsp", "menu", + "multi_buffer", "nanoid", "node_runtime", "notifications", @@ -2352,7 +2412,6 @@ dependencies = [ "call", "channel", "client", - "clock", "collections", "db", "dev_server_projects", @@ -2362,6 +2421,7 @@ dependencies = [ "futures 0.3.28", "fuzzy", "gpui", + "http 0.1.0", "language", "lazy_static", "menu", @@ -2531,6 +2591,7 @@ dependencies = [ "fs", "futures 0.3.28", "gpui", + "http 0.1.0", "indoc", "language", "lsp", @@ -3111,6 +3172,12 @@ dependencies = [ ] [[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + +[[package]] name = "der" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3383,6 +3450,7 @@ dependencies = [ "fuzzy", "git", "gpui", + "http 0.1.0", "indoc", "itertools 0.11.0", "language", @@ -3553,6 +3621,17 @@ dependencies = [ [[package]] name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" @@ -3562,6 +3641,16 @@ dependencies = [ ] [[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "etagere" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3640,6 +3729,16 @@ dependencies = [ ] [[package]] +name = "exec" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886b70328cba8871bfc025858e1de4be16b1d5088f2ba50b57816f4210672615" +dependencies = [ + "errno 0.2.8", + "libc", +] + +[[package]] name = "extension" version = "0.1.0" dependencies = [ @@ -3655,6 +3754,7 @@ dependencies = [ "fs", "futures 0.3.28", "gpui", + "http 0.1.0", "isahc", "language", "log", @@ -3735,9 +3835,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fancy-regex" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" dependencies = [ "bit-set", "regex", @@ -3802,6 +3902,7 @@ dependencies = [ "editor", "futures 0.3.28", "gpui", + "http 0.1.0", "human_bytes", "isahc", "language", @@ -4040,6 +4141,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] +name = "fork" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e74d3423998a57e9d906e49252fb79eb4a04d5cdfe188fb1b7ff9fc076a8ed" +dependencies = [ + "libc", +] + +[[package]] name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4096,7 +4206,7 @@ dependencies = [ "text", "time", "util", - "windows 0.53.0", + "windows 0.56.0", ] [[package]] @@ -4401,6 +4511,7 @@ dependencies = [ "derive_more", "git2", "gpui", + "http 0.1.0", "lazy_static", "log", "parking_lot", @@ -4415,7 +4526,7 @@ dependencies = [ "unindent", "url", "util", - "windows 0.53.0", + "windows 0.56.0", ] [[package]] @@ -4440,6 +4551,7 @@ dependencies = [ "futures 0.3.28", "git", "gpui", + "http 0.1.0", "isahc", "pretty_assertions", "regex", @@ -4447,7 +4559,6 @@ dependencies = [ "serde_json", "unindent", "url", - "util", ] [[package]] @@ -4525,9 +4636,9 @@ version = "0.1.0" dependencies = [ "anyhow", "futures 0.3.28", + "http 0.1.0", "serde", "serde_json", - "util", ] [[package]] @@ -4595,6 +4706,7 @@ dependencies = [ "foreign-types 0.5.0", "futures 0.3.28", "gpui_macros", + "http 0.1.0", "image", "itertools 0.11.0", "lazy_static", @@ -4637,7 +4749,8 @@ dependencies = [ "wayland-cursor", "wayland-protocols", "wayland-protocols-plasma", - "windows 0.53.0", + "windows 0.56.0", + "windows-core 0.56.0", "x11rb", "xkbcommon", ] @@ -4653,9 +4766,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" +checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" [[package]] name = "group" @@ -4740,7 +4853,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes 1.5.0", "headers-core", "http 0.2.9", @@ -4764,7 +4877,6 @@ version = "0.1.0" dependencies = [ "anyhow", "client", - "ctrlc", "fs", "futures 0.3.28", "gpui", @@ -4776,6 +4888,7 @@ dependencies = [ "rpc", "settings", "shellexpand", + "signal-hook", "util", ] @@ -4915,6 +5028,20 @@ checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" [[package]] name = "http" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures 0.3.28", + "futures-lite 1.13.0", + "isahc", + "log", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" @@ -5530,6 +5657,7 @@ dependencies = [ "git", "globset", "gpui", + "http 0.1.0", "indoc", "itertools 0.11.0", "lazy_static", @@ -5620,6 +5748,7 @@ dependencies = [ "feature_flags", "futures 0.3.28", "gpui", + "http 0.1.0", "language", "lazy_static", "log", @@ -5642,7 +5771,6 @@ dependencies = [ "tree-sitter-c", "tree-sitter-cpp", "tree-sitter-css", - "tree-sitter-embedded-template", "tree-sitter-go", "tree-sitter-gomod", "tree-sitter-gowork", @@ -5652,7 +5780,6 @@ dependencies = [ "tree-sitter-proto", "tree-sitter-python", "tree-sitter-regex", - "tree-sitter-ruby", "tree-sitter-rust", "tree-sitter-typescript", "tree-sitter-yaml", @@ -5905,7 +6032,7 @@ dependencies = [ "serde_json", "smol", "util", - "windows 0.53.0", + "windows 0.56.0", ] [[package]] @@ -5974,6 +6101,27 @@ dependencies = [ ] [[package]] +name = "markdown" +version = "0.1.0" +dependencies = [ + "anyhow", + "assets", + "env_logger", + "futures 0.3.28", + "gpui", + "language", + "languages", + "linkify", + "log", + "node_runtime", + "pulldown-cmark", + "settings", + "theme", + "ui", + "util", +] + +[[package]] name = "markdown_preview" version = "0.1.0" dependencies = [ @@ -6193,6 +6341,7 @@ dependencies = [ "log", "parking_lot", "rand 0.8.5", + "serde", "settings", "smallvec", "sum_tree", @@ -6339,15 +6488,21 @@ version = "0.1.0" dependencies = [ "anyhow", "async-compression", + "async-std", "async-tar", "async-trait", + "async_zip", "futures 0.3.28", + "http 0.1.0", "log", "semver", "serde", "serde_json", "smol", + "tempfile", "util", + "walkdir", + "windows 0.56.0", ] [[package]] @@ -6733,10 +6888,11 @@ version = "0.1.0" dependencies = [ "anyhow", "futures 0.3.28", + "http 0.1.0", + "isahc", "schemars", "serde", "serde_json", - "util", ] [[package]] @@ -6772,6 +6928,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + +[[package]] name = "openssl-sys" version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6779,6 +6944,7 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -7217,7 +7383,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "indexmap 1.9.3", "line-wrap", "quick-xml 0.30.0", @@ -7473,6 +7639,7 @@ dependencies = [ "git2", "globset", "gpui", + "http 0.1.0", "itertools 0.11.0", "language", "log", @@ -8002,12 +8169,21 @@ dependencies = [ ] [[package]] +name = "repair_json" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee191e184125fe72cb59b74160e25584e3908f2aaa84cbda1e161347102aa15" +dependencies = [ + "thiserror", +] + +[[package]] name = "reqwest" version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes 1.5.0", "encoding_rs", "futures-core", @@ -8088,21 +8264,6 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" @@ -8111,7 +8272,7 @@ dependencies = [ "getrandom 0.2.10", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.48.0", ] @@ -8264,9 +8425,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.2.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -8275,9 +8436,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.2.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", @@ -8288,9 +8449,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "8.2.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "globset", "sha2 0.10.7", @@ -8341,7 +8502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", - "errno", + "errno 0.3.8", "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.3.8", @@ -8355,7 +8516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.4.2", - "errno", + "errno 0.3.8", "itoa", "libc", "linux-raw-sys 0.4.12", @@ -8369,19 +8530,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12" dependencies = [ - "errno", + "errno 0.3.8", "libc", "rustix 0.38.32", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.7", + "ring", "rustls-webpki", "sct", ] @@ -8404,7 +8565,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", ] [[package]] @@ -8413,8 +8574,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -8538,12 +8699,12 @@ dependencies = [ [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] @@ -8735,6 +8896,7 @@ dependencies = [ "futures-batch", "gpui", "heed", + "http 0.1.0", "language", "languages", "log", @@ -9414,7 +9576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.4", + "base64 0.21.7", "bigdecimal", "bitflags 2.4.2", "byteorder", @@ -9461,7 +9623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.4", + "base64 0.21.7", "bigdecimal", "bitflags 2.4.2", "byteorder", @@ -9650,6 +9812,7 @@ dependencies = [ "env_logger", "futures 0.3.28", "gpui", + "http 0.1.0", "language", "log", "postage", @@ -9670,6 +9833,7 @@ version = "0.1.0" dependencies = [ "anyhow", "futures 0.3.28", + "http 0.1.0", "serde", "serde_json", "smol", @@ -9873,12 +10037,14 @@ dependencies = [ [[package]] name = "taffy" -version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy?rev=1876f72bee5e376023eaa518aa7b8a34c769bd1b#1876f72bee5e376023eaa518aa7b8a34c769bd1b" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2e140b328c6cb5e744bb2c65910b47df86b239afc793ee2c52262569cf9225" dependencies = [ "arrayvec", "grid", "num-traits", + "serde", "slotmap", ] @@ -9927,6 +10093,7 @@ dependencies = [ "fuzzy", "gpui", "language", + "menu", "picker", "project", "schemars", @@ -10005,7 +10172,7 @@ dependencies = [ "theme", "thiserror", "util", - "windows 0.53.0", + "windows 0.56.0", ] [[package]] @@ -10049,6 +10216,7 @@ dependencies = [ "ctor", "env_logger", "gpui", + "http 0.1.0", "lazy_static", "log", "parking_lot", @@ -10136,18 +10304,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", @@ -10177,12 +10345,12 @@ dependencies = [ [[package]] name = "tiktoken-rs" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4427b6b1c6b38215b92dd47a83a0ecc6735573d0a5a4c14acc0ac5b33b28adb" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" dependencies = [ "anyhow", - "base64 0.21.4", + "base64 0.21.7", "bstr", "fancy-regex", "lazy_static", @@ -10917,7 +11085,7 @@ dependencies = [ "story", "strum", "theme", - "windows 0.53.0", + "windows 0.56.0", ] [[package]] @@ -11023,12 +11191,6 @@ checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" @@ -11097,7 +11259,6 @@ dependencies = [ "futures-lite 1.13.0", "git2", "globset", - "isahc", "lazy_static", "log", "rand 0.8.5", @@ -11109,7 +11270,6 @@ dependencies = [ "tempfile", "tendril", "unicase", - "url", ] [[package]] @@ -11209,6 +11369,7 @@ dependencies = [ "language", "log", "lsp", + "multi_buffer", "nvim-rs", "parking_lot", "regex", @@ -11293,9 +11454,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -12057,19 +12218,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows" -version = "0.53.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.53.0", - "windows-implement", - "windows-interface", - "windows-targets 0.52.4", + "windows-core 0.56.0", + "windows-targets 0.52.5", ] [[package]] @@ -12078,24 +12237,26 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.53.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ + "windows-implement", + "windows-interface", "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-implement" -version = "0.53.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", @@ -12104,9 +12265,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.53.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", @@ -12115,11 +12276,11 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -12146,7 +12307,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -12181,17 +12342,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -12208,9 +12370,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -12226,9 +12388,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -12244,9 +12406,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -12262,9 +12430,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -12280,9 +12448,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -12298,9 +12466,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -12316,9 +12484,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -12510,6 +12678,7 @@ dependencies = [ "fs", "futures 0.3.28", "gpui", + "http 0.1.0", "itertools 0.11.0", "language", "lazy_static", @@ -12545,6 +12714,7 @@ dependencies = [ "git", "git2", "gpui", + "http 0.1.0", "ignore", "itertools 0.11.0", "language", @@ -12663,7 +12833,9 @@ name = "xtask" version = "0.1.0" dependencies = [ "anyhow", + "cargo_toml", "clap 4.4.4", + "toml 0.8.10", ] [[package]] @@ -12756,7 +12928,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.135.2" +version = "0.136.2" dependencies = [ "activity_indicator", "anyhow", @@ -12773,7 +12945,6 @@ dependencies = [ "clap 4.4.4", "cli", "client", - "clock", "collab_ui", "collections", "command_palette", @@ -12795,6 +12966,7 @@ dependencies = [ "go_to_line", "gpui", "headless", + "http 0.1.0", "image_viewer", "inline_completion_button", "install_cli", @@ -12804,6 +12976,7 @@ dependencies = [ "language_selector", "language_tools", "languages", + "libc", "log", "markdown_preview", "menu", @@ -12856,7 +13029,7 @@ dependencies = [ [[package]] name = "zed_astro" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.4", ] @@ -12948,7 +13121,7 @@ dependencies = [ [[package]] name = "zed_gleam" -version = "0.1.1" +version = "0.1.2" dependencies = [ "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -12990,7 +13163,7 @@ dependencies = [ [[package]] name = "zed_php" -version = "0.0.2" +version = "0.0.3" dependencies = [ "zed_extension_api 0.0.4", ] @@ -13010,6 +13183,13 @@ dependencies = [ ] [[package]] +name = "zed_ruby" +version = "0.0.3" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "zed_svelte" version = "0.0.1" dependencies = [ @@ -13039,7 +13219,7 @@ dependencies = [ [[package]] name = "zed_vue" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 5b0e8f746e612..27271326eb60f 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, copyDesktopItems, curl, + perl, pkg-config, protobuf, xcbuild, @@ -26,13 +27,13 @@ rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.135.2"; + version = "0.136.2"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-XnfTrcLKjJH42l9L9KxogMhNQ2u/8G4fyd6i/0dO5S0="; + hash = "sha256-w2g9xkqB98XLED1Z9vIjD1fhOz2p6LxnVgf6xWSFObA="; fetchSubmodules = true; }; @@ -40,13 +41,12 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.4.0" = "sha256-U8278YkskWE1E60JVTx4hRv4322EV9jz8fzJkBTG3R8="; + "blade-graphics-0.4.0" = "sha256-w5BTv/40Zy94dmoZUpVVWrhzR2IaGAIJ0Ftsw1v/R9Y="; "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8="; "heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s="; "lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU="; "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8="; "pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM="; - "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE="; "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; @@ -68,6 +68,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ copyDesktopItems curl + perl pkg-config protobuf rustPlatform.bindgenHook @@ -127,11 +128,8 @@ rustPlatform.buildRustPackage rec { ''; checkFlags = lib.optionals stdenv.hostPlatform.isLinux [ - # Fails with "On 2823 Failed to find test1:A" - "--skip=test_base_keymap" - # Fails with "called `Result::unwrap()` on an `Err` value: Invalid keystroke `cmd-k`" - # https://github.com/zed-industries/zed/issues/10427 - "--skip=test_disabled_keymap_binding" + # Fails on certain hosts (including Hydra) for unclear reason + "--skip=test_open_paths_action" ]; postInstall = '' |