Skip to content

Commit 8bddce7

Browse files
authored
zed-editor: 0.174.6 -> 0.175.5 (#385589)
2 parents 8e372bf + e5c8507 commit 8bddce7

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed
Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/script/generate-licenses b/script/generate-licenses
2-
index 9602813f0c..d16d11c203 100755
2+
index 51749a91e2..d3fd7ee351 100755
33
--- a/script/generate-licenses
44
+++ b/script/generate-licenses
5-
@@ -16,16 +16,9 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
5+
@@ -16,28 +16,17 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
66

7-
echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
7+
echo -e "\n# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
88

99
-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then
1010
- echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."
@@ -14,8 +14,20 @@ index 9602813f0c..d16d11c203 100755
1414
-fi
1515

1616
echo "Generating cargo licenses"
17+
18+
stderr_file=$(mktemp)
19+
1720
cargo about generate \
1821
- --fail \
1922
-c script/licenses/zed-licenses.toml \
20-
"${TEMPLATE_FILE}" >> $OUTPUT_FILE
23+
"${TEMPLATE_FILE}" \
24+
2> >(tee "$stderr_file") \
25+
>> $OUTPUT_FILE
26+
27+
-if cat "$stderr_file" | grep -v "\[WARN\]" > /dev/null; then
28+
- echo "Error: License check failed - warnings found" >&2
29+
- exit 1
30+
-fi
2131

32+
sed -i.bak 's/"/"/g' $OUTPUT_FILE
33+
sed -i.bak 's/'/'\''/g' $OUTPUT_FILE # The ` '\'' ` thing ends the string, appends a single quote, and re-opens the string

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

Lines changed: 3 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.6";
99+
version = "0.175.5";
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-X/xGOJBKXRiCfcAyZ0Tiedk9WCnjwA8Ra4TMPf/sYbU=";
107+
hash = "sha256-CeuZv5GFZ9tttpj+4JAgQZcKtPpbE+NxawcW5W0CFws=";
108108
};
109109

110110
patches = [
@@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec {
130130
'';
131131

132132
useFetchCargoVendor = true;
133-
cargoHash = "sha256-EXlV+QFaIErre7Bi06e7V8VKo5SuLdqJQDvQujmBP8o=";
133+
cargoHash = "sha256-UJAH1hCf/p974GNJtvNMzZs8RkxtJQeLhUBCJjLsapU=";
134134

135135
nativeBuildInputs =
136136
[

0 commit comments

Comments
 (0)