cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #303233 from GaetanLepage/zed

Browse source 
zed-editor: 0.129.2 -> 0.130.6
This commit is contained in:
Weijia Wang 2024-04-12 23:20:00 +02:00 committed by GitHub
commit 8ff402c7c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 217 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

471
pkgs/by-name/ze/zed-editor/Cargo.lock generated
View file

@ -9,6 +9,7 @@ dependencies = [
"anyhow", "anyhow",
"auto_update", "auto_update",
"editor", "editor",
"extension",
"futures 0.3.28", "futures 0.3.28",
"gpui", "gpui",
"language", "language",
@ -87,9 +88,9 @@ dependencies = [
[[package]] [[package]]
name = "alacritty_terminal" name = "alacritty_terminal"
version = "0.23.0-rc1" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc2c16faa5425a10be102dda76f73d76049b44746e18ddeefc44d78bbe76cbce" checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f"
dependencies = [ dependencies = [
"base64 0.22.0", "base64 0.22.0",
"bitflags 2.4.2", "bitflags 2.4.2",
@ -212,6 +213,24 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "anthropic"
version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
"serde",
"serde_json",
"tokio",
"util",
]
[[package]]
name = "any_vec"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78f17bacc1bc7b91fef7b1885c10772eb2b9e4e989356f6f0f6a972240f97cd"
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.75" version = "1.0.75"
@ -285,9 +304,9 @@ dependencies = [
[[package]] [[package]]
name = "ashpd" name = "ashpd"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
dependencies = [ dependencies = [
"async-fs 2.1.1", "async-fs 2.1.1",
"async-net 2.0.0", "async-net 2.0.0",
@ -298,7 +317,7 @@ dependencies = [
"serde", "serde",
"serde_repr", "serde_repr",
"url", "url",
"zbus 3.15.1", "zbus",
] ]
[[package]] [[package]]
@ -322,6 +341,7 @@ dependencies = [
"ctor", "ctor",
"editor", "editor",
"env_logger", "env_logger",
"file_icons",
"fs", "fs",
"futures 0.3.28", "futures 0.3.28",
"gpui", "gpui",
@ -351,16 +371,6 @@ dependencies = [
"workspace", "workspace",
] ]
[[package]]
name = "async-broadcast"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
dependencies = [
"event-listener 2.5.3",
"futures-core",
]
[[package]] [[package]]
name = "async-broadcast" name = "async-broadcast"
version = "0.7.0" version = "0.7.0"
@ -2166,6 +2176,7 @@ dependencies = [
name = "collab" name = "collab"
version = "0.44.0" version = "0.44.0"
dependencies = [ dependencies = [
"anthropic",
"anyhow", "anyhow",
"async-trait", "async-trait",
"async-tungstenite", "async-tungstenite",
@ -2218,6 +2229,7 @@ dependencies = [
"rustc-demangle", "rustc-demangle",
"scrypt", "scrypt",
"sea-orm", "sea-orm",
"semantic_version",
"semver", "semver",
"serde", "serde",
"serde_derive", "serde_derive",
@ -2565,19 +2577,21 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.10.0" version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" checksum = "c578f2b9abb4d5f3fbb12aba4008084d435dc6a8425c195cfe0b3594bfea0c25"
dependencies = [ dependencies = [
"fontdb 0.15.0", "bitflags 2.4.2",
"fontdb 0.16.2",
"libm", "libm",
"log", "log",
"rangemap", "rangemap",
"rustc-hash", "rustc-hash",
"rustybuzz 0.11.0", "rustybuzz 0.12.1",
"self_cell", "self_cell",
"swash", "swash",
"sys-locale", "sys-locale",
"ttf-parser 0.20.0",
"unicode-bidi", "unicode-bidi",
"unicode-linebreak", "unicode-linebreak",
"unicode-script", "unicode-script",
@ -2799,7 +2813,7 @@ dependencies = [
"autocfg", "autocfg",
"cfg-if", "cfg-if",
"crossbeam-utils", "crossbeam-utils",
"memoffset 0.9.0", "memoffset",
"scopeguard", "scopeguard",
] ]
@ -3254,6 +3268,8 @@ dependencies = [
"sum_tree", "sum_tree",
"text", "text",
"theme", "theme",
"time",
"time_format",
"tree-sitter-html", "tree-sitter-html",
"tree-sitter-rust", "tree-sitter-rust",
"tree-sitter-typescript", "tree-sitter-typescript",
@ -3491,6 +3507,7 @@ dependencies = [
"fs", "fs",
"futures 0.3.28", "futures 0.3.28",
"gpui", "gpui",
"isahc",
"language", "language",
"log", "log",
"lsp", "lsp",
@ -3498,6 +3515,7 @@ dependencies = [
"parking_lot", "parking_lot",
"project", "project",
"schemars", "schemars",
"semantic_version",
"serde", "serde",
"serde_json", "serde_json",
"serde_json_lenient", "serde_json_lenient",
@ -3544,10 +3562,13 @@ dependencies = [
"db", "db",
"editor", "editor",
"extension", "extension",
"fs",
"fuzzy", "fuzzy",
"gpui", "gpui",
"language", "language",
"picker",
"project", "project",
"semantic_version",
"serde", "serde",
"settings", "settings",
"smallvec", "smallvec",
@ -3677,6 +3698,18 @@ dependencies = [
"workspace", "workspace",
] ]
[[package]]
name = "file_icons"
version = "0.1.0"
dependencies = [
"collections",
"gpui",
"serde",
"serde_derive",
"serde_json",
"util",
]
[[package]] [[package]]
name = "filetime" name = "filetime"
version = "0.2.22" version = "0.2.22"
@ -3793,16 +3826,16 @@ dependencies = [
[[package]] [[package]]
name = "fontdb" name = "fontdb"
version = "0.15.0" version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
dependencies = [ dependencies = [
"fontconfig-parser", "fontconfig-parser",
"log", "log",
"memmap2 0.8.0", "memmap2 0.9.4",
"slotmap", "slotmap",
"tinyvec", "tinyvec",
"ttf-parser 0.19.2", "ttf-parser 0.20.0",
] ]
[[package]] [[package]]
@ -3849,9 +3882,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]] [[package]]
name = "form_urlencoded" name = "form_urlencoded"
version = "1.2.0" version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [ dependencies = [
"percent-encoding", "percent-encoding",
] ]
@ -3887,6 +3920,7 @@ dependencies = [
"collections", "collections",
"fsevent", "fsevent",
"futures 0.3.28", "futures 0.3.28",
"git",
"git2", "git2",
"gpui", "gpui",
"lazy_static", "lazy_static",
@ -4184,14 +4218,21 @@ dependencies = [
name = "git" name = "git"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow",
"clock", "clock",
"collections",
"git2", "git2",
"lazy_static", "lazy_static",
"log", "log",
"pretty_assertions",
"serde",
"serde_json",
"smol", "smol",
"sum_tree", "sum_tree",
"text", "text",
"time",
"unindent", "unindent",
"url",
] ]
[[package]] [[package]]
@ -4368,6 +4409,7 @@ dependencies = [
"resvg", "resvg",
"schemars", "schemars",
"seahash", "seahash",
"semantic_version",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
@ -4744,9 +4786,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
[[package]] [[package]]
name = "idna" name = "idna"
version = "0.4.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [ dependencies = [
"unicode-bidi", "unicode-bidi",
"unicode-normalization", "unicode-normalization",
@ -5295,15 +5337,12 @@ dependencies = [
"tree-sitter", "tree-sitter",
"tree-sitter-bash", "tree-sitter-bash",
"tree-sitter-c", "tree-sitter-c",
"tree-sitter-c-sharp",
"tree-sitter-clojure",
"tree-sitter-cpp", "tree-sitter-cpp",
"tree-sitter-css", "tree-sitter-css",
"tree-sitter-dart", "tree-sitter-dart",
"tree-sitter-elixir", "tree-sitter-elixir",
"tree-sitter-elm", "tree-sitter-elm",
"tree-sitter-embedded-template", "tree-sitter-embedded-template",
"tree-sitter-erlang",
"tree-sitter-glsl", "tree-sitter-glsl",
"tree-sitter-go", "tree-sitter-go",
"tree-sitter-gomod", "tree-sitter-gomod",
@ -5318,7 +5357,6 @@ dependencies = [
"tree-sitter-nix", "tree-sitter-nix",
"tree-sitter-nu", "tree-sitter-nu",
"tree-sitter-ocaml", "tree-sitter-ocaml",
"tree-sitter-php",
"tree-sitter-proto", "tree-sitter-proto",
"tree-sitter-python", "tree-sitter-python",
"tree-sitter-racket", "tree-sitter-racket",
@ -5326,11 +5364,9 @@ dependencies = [
"tree-sitter-ruby", "tree-sitter-ruby",
"tree-sitter-rust", "tree-sitter-rust",
"tree-sitter-scheme", "tree-sitter-scheme",
"tree-sitter-toml",
"tree-sitter-typescript", "tree-sitter-typescript",
"tree-sitter-vue", "tree-sitter-vue",
"tree-sitter-yaml", "tree-sitter-yaml",
"tree-sitter-zig",
"unindent", "unindent",
"util", "util",
"workspace", "workspace",
@ -5495,7 +5531,7 @@ name = "live_kit_client"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-broadcast 0.7.0", "async-broadcast",
"async-trait", "async-trait",
"collections", "collections",
"core-foundation", "core-foundation",
@ -5570,6 +5606,7 @@ dependencies = [
"serde_json", "serde_json",
"smol", "smol",
"util", "util",
"windows 0.53.0",
] ]
[[package]] [[package]]
@ -5742,15 +5779,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "memoffset"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "memoffset" name = "memoffset"
version = "0.9.0" version = "0.9.0"
@ -5988,18 +6016,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "nix"
version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.7.1",
]
[[package]] [[package]]
name = "nix" name = "nix"
version = "0.27.1" version = "0.27.1"
@ -6009,7 +6025,7 @@ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"cfg-if", "cfg-if",
"libc", "libc",
"memoffset 0.9.0", "memoffset",
] ]
[[package]] [[package]]
@ -6378,9 +6394,9 @@ dependencies = [
"rand 0.8.5", "rand 0.8.5",
"serde", "serde",
"sha2 0.10.7", "sha2 0.10.7",
"zbus 4.0.1", "zbus",
"zeroize", "zeroize",
"zvariant 4.0.2", "zvariant",
] ]
[[package]] [[package]]
@ -6391,9 +6407,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]] [[package]]
name = "open" name = "open"
version = "5.0.1" version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
dependencies = [ dependencies = [
"is-wsl", "is-wsl",
"libc", "libc",
@ -6715,9 +6731,9 @@ dependencies = [
[[package]] [[package]]
name = "percent-encoding" name = "percent-encoding"
version = "2.3.0" version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]] [[package]]
name = "petgraph" name = "petgraph"
@ -6757,6 +6773,7 @@ dependencies = [
"env_logger", "env_logger",
"gpui", "gpui",
"menu", "menu",
"serde",
"serde_json", "serde_json",
"ui", "ui",
"workspace", "workspace",
@ -7066,6 +7083,7 @@ dependencies = [
"fs", "fs",
"futures 0.3.28", "futures 0.3.28",
"fuzzy", "fuzzy",
"git",
"git2", "git2",
"globset", "globset",
"gpui", "gpui",
@ -7107,6 +7125,7 @@ dependencies = [
"collections", "collections",
"db", "db",
"editor", "editor",
"file_icons",
"gpui", "gpui",
"language", "language",
"menu", "menu",
@ -7447,11 +7466,9 @@ dependencies = [
name = "recent_projects" name = "recent_projects"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"collections",
"editor", "editor",
"fuzzy", "fuzzy",
"gpui", "gpui",
"itertools 0.11.0",
"language", "language",
"menu", "menu",
"ordered-float 2.10.0", "ordered-float 2.10.0",
@ -8046,11 +8063,11 @@ dependencies = [
[[package]] [[package]]
name = "rustybuzz" name = "rustybuzz"
version = "0.11.0" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.4.2",
"bytemuck", "bytemuck",
"libm", "libm",
"smallvec", "smallvec",
@ -8286,6 +8303,7 @@ dependencies = [
name = "search" name = "search"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"any_vec",
"anyhow", "anyhow",
"bitflags 2.4.2", "bitflags 2.4.2",
"client", "client",
@ -8299,7 +8317,6 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"settings", "settings",
"smallvec",
"smol", "smol",
"theme", "theme",
"ui", "ui",
@ -8351,6 +8368,14 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
[[package]]
name = "semantic_version"
version = "0.1.0"
dependencies = [
"anyhow",
"serde",
]
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.18" version = "1.0.18"
@ -9142,6 +9167,7 @@ dependencies = [
"ctrlc", "ctrlc",
"dialoguer", "dialoguer",
"editor", "editor",
"embed-manifest",
"fuzzy", "fuzzy",
"gpui", "gpui",
"indoc", "indoc",
@ -9398,6 +9424,29 @@ dependencies = [
"winx", "winx",
] ]
[[package]]
name = "tab_switcher"
version = "0.1.0"
dependencies = [
"anyhow",
"collections",
"ctor",
"editor",
"env_logger",
"gpui",
"language",
"menu",
"picker",
"project",
"serde",
"serde_json",
"terminal_view",
"theme",
"ui",
"util",
"workspace",
]
[[package]] [[package]]
name = "taffy" name = "taffy"
version = "0.3.11" version = "0.3.11"
@ -9451,6 +9500,7 @@ dependencies = [
"editor", "editor",
"fuzzy", "fuzzy",
"gpui", "gpui",
"itertools 0.11.0",
"language", "language",
"menu", "menu",
"picker", "picker",
@ -9469,8 +9519,8 @@ dependencies = [
name = "telemetry_events" name = "telemetry_events"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"semantic_version",
"serde", "serde",
"util",
] ]
[[package]] [[package]]
@ -10151,24 +10201,6 @@ dependencies = [
"tree-sitter", "tree-sitter",
] ]
[[package]]
name = "tree-sitter-c-sharp"
version = "0.20.0"
source = "git+https://github.com/tree-sitter/tree-sitter-c-sharp?rev=dd5e59721a5f8dae34604060833902b882023aaf#dd5e59721a5f8dae34604060833902b882023aaf"
dependencies = [
"cc",
"tree-sitter",
]
[[package]]
name = "tree-sitter-clojure"
version = "0.0.9"
source = "git+https://github.com/prcastro/tree-sitter-clojure?branch=update-ts#38b4f8d264248b2fd09575fbce66f7c22e8929d5"
dependencies = [
"cc",
"tree-sitter",
]
[[package]] [[package]]
name = "tree-sitter-cpp" name = "tree-sitter-cpp"
version = "0.20.0" version = "0.20.0"
@ -10224,16 +10256,6 @@ dependencies = [
"tree-sitter", "tree-sitter",
] ]
[[package]]
name = "tree-sitter-erlang"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93ced5145ebb17f83243bf055b74e108da7cc129e12faab4166df03f59b287f4"
dependencies = [
"cc",
"tree-sitter",
]
[[package]] [[package]]
name = "tree-sitter-glsl" name = "tree-sitter-glsl"
version = "0.1.4" version = "0.1.4"
@ -10372,16 +10394,6 @@ dependencies = [
"tree-sitter", "tree-sitter",
] ]
[[package]]
name = "tree-sitter-php"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0db3788e709a5adfb583683a4b686a084e41a0f9e5a2fcb9a8e358f11481036a"
dependencies = [
"cc",
"tree-sitter",
]
[[package]] [[package]]
name = "tree-sitter-proto" name = "tree-sitter-proto"
version = "0.0.2" version = "0.0.2"
@ -10449,15 +10461,6 @@ dependencies = [
"tree-sitter", "tree-sitter",
] ]
[[package]]
name = "tree-sitter-toml"
version = "0.5.1"
source = "git+https://github.com/tree-sitter/tree-sitter-toml?rev=342d9be207c2dba869b9967124c679b5e6fd0ebe#342d9be207c2dba869b9967124c679b5e6fd0ebe"
dependencies = [
"cc",
"tree-sitter",
]
[[package]] [[package]]
name = "tree-sitter-typescript" name = "tree-sitter-typescript"
version = "0.20.2" version = "0.20.2"
@ -10485,15 +10488,6 @@ dependencies = [
"tree-sitter", "tree-sitter",
] ]
[[package]]
name = "tree-sitter-zig"
version = "0.0.1"
source = "git+https://github.com/maxxnino/tree-sitter-zig?rev=0d08703e4c3f426ec61695d7617415fff97029bd#0d08703e4c3f426ec61695d7617415fff97029bd"
dependencies = [
"cc",
"tree-sitter",
]
[[package]] [[package]]
name = "try-lock" name = "try-lock"
version = "0.2.4" version = "0.2.4"
@ -10512,12 +10506,6 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6" checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6"
[[package]]
name = "ttf-parser"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
[[package]] [[package]]
name = "ttf-parser" name = "ttf-parser"
version = "0.20.0" version = "0.20.0"
@ -10575,7 +10563,7 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
dependencies = [ dependencies = [
"memoffset 0.9.0", "memoffset",
"tempfile", "tempfile",
"winapi", "winapi",
] ]
@ -10712,9 +10700,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]] [[package]]
name = "url" name = "url"
version = "2.4.1" version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
dependencies = [ dependencies = [
"form_urlencoded", "form_urlencoded",
"idna", "idna",
@ -10985,9 +10973,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.87" version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"wasm-bindgen-macro", "wasm-bindgen-macro",
@ -10995,9 +10983,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.87" version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
@ -11022,9 +11010,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.87" version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -11032,9 +11020,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.87" version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -11045,9 +11033,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.87" version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]] [[package]]
name = "wasm-encoder" name = "wasm-encoder"
@ -11295,7 +11283,7 @@ dependencies = [
"log", "log",
"mach", "mach",
"memfd", "memfd",
"memoffset 0.9.0", "memoffset",
"paste", "paste",
"psm", "psm",
"rustix 0.38.32", "rustix 0.38.32",
@ -11531,9 +11519,9 @@ dependencies = [
[[package]] [[package]]
name = "weezl" name = "weezl"
version = "0.1.7" version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]] [[package]]
name = "welcome" name = "welcome"
@ -12132,6 +12120,7 @@ dependencies = [
name = "workspace" name = "workspace"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"any_vec",
"anyhow", "anyhow",
"async-recursion 1.0.5", "async-recursion 1.0.5",
"bincode", "bincode",
@ -12325,54 +12314,13 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "zbus"
version = "3.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d"
dependencies = [
"async-broadcast 0.5.1",
"async-executor",
"async-fs 1.6.0",
"async-io 1.13.0",
"async-lock 2.8.0",
"async-process 1.7.0",
"async-recursion 1.0.5",
"async-task",
"async-trait",
"blocking",
"byteorder",
"derivative",
"enumflags2",
"event-listener 2.5.3",
"futures-core",
"futures-sink",
"futures-util",
"hex",
"nix 0.26.4",
"once_cell",
"ordered-stream",
"rand 0.8.5",
"serde",
"serde_repr",
"sha1",
"static_assertions",
"tracing",
"uds_windows",
"winapi",
"xdg-home",
"zbus_macros 3.15.1",
"zbus_names 2.6.1",
"zvariant 3.15.1",
]
[[package]] [[package]]
name = "zbus" name = "zbus"
version = "4.0.1" version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030"
dependencies = [ dependencies = [
"async-broadcast 0.7.0", "async-broadcast",
"async-executor", "async-executor",
"async-fs 2.1.1", "async-fs 2.1.1",
"async-io 2.3.1", "async-io 2.3.1",
@ -12400,23 +12348,9 @@ dependencies = [
"uds_windows", "uds_windows",
"windows-sys 0.52.0", "windows-sys 0.52.0",
"xdg-home", "xdg-home",
"zbus_macros 4.0.1", "zbus_macros",
"zbus_names 3.0.0", "zbus_names",
"zvariant 4.0.2", "zvariant",
]
[[package]]
name = "zbus_macros"
version = "3.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"regex",
"syn 1.0.109",
"zvariant_utils",
] ]
[[package]] [[package]]
@ -12433,17 +12367,6 @@ dependencies = [
"zvariant_utils", "zvariant_utils",
] ]
[[package]]
name = "zbus_names"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
dependencies = [
"serde",
"static_assertions",
"zvariant 3.15.1",
]
[[package]] [[package]]
name = "zbus_names" name = "zbus_names"
version = "3.0.0" version = "3.0.0"
@ -12452,12 +12375,12 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
dependencies = [ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"zvariant 4.0.2", "zvariant",
] ]
[[package]] [[package]]
name = "zed" name = "zed"
version = "0.129.2" version = "0.130.6"
dependencies = [ dependencies = [
"activity_indicator", "activity_indicator",
"anyhow", "anyhow",
@ -12488,6 +12411,7 @@ dependencies = [
"extensions_ui", "extensions_ui",
"feedback", "feedback",
"file_finder", "file_finder",
"file_icons",
"fs", "fs",
"futures 0.3.28", "futures 0.3.28",
"go_to_line", "go_to_line",
@ -12522,6 +12446,7 @@ dependencies = [
"settings", "settings",
"simplelog", "simplelog",
"smol", "smol",
"tab_switcher",
"task", "task",
"tasks_ui", "tasks_ui",
"terminal_view", "terminal_view",
@ -12550,14 +12475,28 @@ dependencies = [
name = "zed_astro" name = "zed_astro"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "zed_extension_api 0.0.4",
] ]
[[package]] [[package]]
name = "zed_extension_api" name = "zed_clojure"
version = "0.0.4" version = "0.0.1"
dependencies = [ dependencies = [
"wit-bindgen", "zed_extension_api 0.0.4",
]
[[package]]
name = "zed_csharp"
version = "0.0.1"
dependencies = [
"zed_extension_api 0.0.4",
]
[[package]]
name = "zed_erlang"
version = "0.0.1"
dependencies = [
"zed_extension_api 0.0.4",
] ]
[[package]] [[package]]
@ -12570,45 +12509,82 @@ dependencies = [
] ]
[[package]] [[package]]
name = "zed_gleam" name = "zed_extension_api"
version = "0.0.1" version = "0.0.5"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "wit-bindgen",
]
[[package]]
name = "zed_extension_api"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5f4ae4e302a80591635ef9a236b35fde6fcc26cfd060e66fde4ba9f9fd394a1"
dependencies = [
"wit-bindgen",
]
[[package]]
name = "zed_gleam"
version = "0.0.2"
dependencies = [
"zed_extension_api 0.0.4",
] ]
[[package]] [[package]]
name = "zed_haskell" name = "zed_haskell"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "zed_extension_api 0.0.4",
]
[[package]]
name = "zed_php"
version = "0.0.1"
dependencies = [
"zed_extension_api 0.0.4",
] ]
[[package]] [[package]]
name = "zed_prisma" name = "zed_prisma"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "zed_extension_api 0.0.4",
] ]
[[package]] [[package]]
name = "zed_purescript" name = "zed_purescript"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "zed_extension_api 0.0.4",
] ]
[[package]] [[package]]
name = "zed_svelte" name = "zed_svelte"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "zed_extension_api 0.0.4",
]
[[package]]
name = "zed_toml"
version = "0.0.2"
dependencies = [
"zed_extension_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "zed_uiua" name = "zed_uiua"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"zed_extension_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "zed_extension_api 0.0.4",
]
[[package]]
name = "zed_zig"
version = "0.0.1"
dependencies = [
"zed_extension_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -12687,21 +12663,6 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "zvariant"
version = "3.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67"
dependencies = [
"byteorder",
"enumflags2",
"libc",
"serde",
"static_assertions",
"url",
"zvariant_derive 3.15.1",
]
[[package]] [[package]]
name = "zvariant" name = "zvariant"
version = "4.0.2" version = "4.0.2"
@ -12712,20 +12673,8 @@ dependencies = [
"enumflags2", "enumflags2",
"serde", "serde",
"static_assertions", "static_assertions",
"zvariant_derive 4.0.2", "url",
] "zvariant_derive",
[[package]]
name = "zvariant_derive"
version = "3.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 1.0.109",
"zvariant_utils",
] ]
[[package]] [[package]]

13
pkgs/by-name/ze/zed-editor/package.nix
View file

@ -27,13 +27,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zed"; pname = "zed";
version = "0.129.2"; version = "0.130.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zed-industries"; owner = "zed-industries";
repo = "zed"; repo = "zed";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5VNPgZR1E/s5mpwU46zG640KucdyS+vnieveMzVdPNs="; hash = "sha256-ENlvjqoxPInTVpt7qpV+02AbAOCnfCrowfDTyyr4Y7A=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -50,8 +50,6 @@ rustPlatform.buildRustPackage rec {
"taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
"tree-sitter-0.20.100" = "sha256-k8au4++UJyaOCNo0cqokaQ5Is3BmIiCBSxiUkbrzhFQ="; "tree-sitter-0.20.100" = "sha256-k8au4++UJyaOCNo0cqokaQ5Is3BmIiCBSxiUkbrzhFQ=";
"tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=";
"tree-sitter-c-sharp-0.20.0" = "sha256-DlnGIky33CuRKkVVS+tOTBLVOVzASXqdaUrZawh6LZc=";
"tree-sitter-clojure-0.0.9" = "sha256-H0OEnsoJxcDqlJ32ac7KCS2stT02XKrZ/v4mGMoN2EI=";
"tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM=";
"tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; "tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU=";
"tree-sitter-dart-0.0.1" = "sha256-FE6zXy0lAUWWayrM3urZFnQaEYBcnmaVANcUUnvw1q4="; "tree-sitter-dart-0.0.1" = "sha256-FE6zXy0lAUWWayrM3urZFnQaEYBcnmaVANcUUnvw1q4=";
@ -72,11 +70,9 @@ rustPlatform.buildRustPackage rec {
"tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU="; "tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU=";
"tree-sitter-racket-0.0.1" = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; "tree-sitter-racket-0.0.1" = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8=";
"tree-sitter-scheme-0.2.0" = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4="; "tree-sitter-scheme-0.2.0" = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4=";
"tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ=";
"tree-sitter-typescript-0.20.2" = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; "tree-sitter-typescript-0.20.2" = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
"tree-sitter-vue-0.0.1" = "sha256-8v2e03A/Uj6zCJTH4j6TPwDQcNFeze1jepMADT6UVis="; "tree-sitter-vue-0.0.1" = "sha256-8v2e03A/Uj6zCJTH4j6TPwDQcNFeze1jepMADT6UVis=";
"tree-sitter-yaml-0.0.1" = "sha256-S59jLlipBI2kwFuZDMmpv0TOZpGyXpbAizN3yC6wJ5I="; "tree-sitter-yaml-0.0.1" = "sha256-S59jLlipBI2kwFuZDMmpv0TOZpGyXpbAizN3yC6wJ5I=";
"tree-sitter-zig-0.0.1" = "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=";
}; };
}; };
@ -144,6 +140,9 @@ rustPlatform.buildRustPackage rec {
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [ checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
# Fails with "On 2823 Failed to find test1:A" # Fails with "On 2823 Failed to find test1:A"
"--skip=test_base_keymap" "--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"
]; ];
postInstall = '' postInstall = ''
@ -203,5 +202,7 @@ rustPlatform.buildRustPackage rec {
]; ];
mainProgram = "zed"; mainProgram = "zed";
platforms = platforms.all; platforms = platforms.all;
# Currently broken on darwin: https://github.com/NixOS/nixpkgs/pull/303233#issuecomment-2048650618
broken = stdenv.isDarwin;
}; };
} }