Skip to content

Commit d91510f

Browse files
authored
zed-editor: 0.174.5 -> 0.174.6 (#383717)
2 parents a6c808e + 9cb3ccd commit d91510f

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/.cargo/config.toml b/.cargo/config.toml
2+
index 07cbc23195..b3c4d43e0f 100644
3+
--- a/.cargo/config.toml
4+
+++ b/.cargo/config.toml
5+
@@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
6+
[alias]
7+
xtask = "run --package xtask --"
8+
9+
-[target.x86_64-unknown-linux-gnu]
10+
-linker = "clang"
11+
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
12+
-
13+
-[target.aarch64-unknown-linux-gnu]
14+
-linker = "clang"
15+
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
16+
-
17+
[target.aarch64-apple-darwin]
18+
rustflags = ["-C", "link-args=-Objc -all_load"]
19+

pkgs/by-name/ze/zed-editor/package.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ let
9696
in
9797
rustPlatform.buildRustPackage rec {
9898
pname = "zed-editor";
99-
version = "0.174.5";
99+
version = "0.174.6";
100100

101101
outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
102102

103103
src = fetchFromGitHub {
104104
owner = "zed-industries";
105105
repo = "zed";
106106
tag = "v${version}";
107-
hash = "sha256-zy0YiCPvLK8jRYldxuPaUfN2/VSPKgqCBu3ZQxZ/mT4=";
107+
hash = "sha256-X/xGOJBKXRiCfcAyZ0Tiedk9WCnjwA8Ra4TMPf/sYbU=";
108108
};
109109

110110
patches = [
@@ -113,6 +113,12 @@ rustPlatform.buildRustPackage rec {
113113
# Until https://github.com/zed-industries/zed/issues/19971 is fixed,
114114
# we also skip any crate for which the license cannot be determined.
115115
./0001-generate-licenses.patch
116+
117+
# Upstream delegates linking on Linux to clang to make use of mold,
118+
# but builds fine with our standard linker.
119+
# This patch removes their linker override from the cargo config.
120+
./0002-linux-linker.patch
121+
116122
# See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840
117123
"script/patches/use-cross-platform-livekit.patch"
118124
];
@@ -124,7 +130,7 @@ rustPlatform.buildRustPackage rec {
124130
'';
125131

126132
useFetchCargoVendor = true;
127-
cargoHash = "sha256-qxLowOIQ0j4ilzCdfiMQQIMfeQHvl5J8GyNJLeJ1GE4=";
133+
cargoHash = "sha256-EXlV+QFaIErre7Bi06e7V8VKo5SuLdqJQDvQujmBP8o=";
128134

129135
nativeBuildInputs =
130136
[

0 commit comments

Comments
 (0)