zed-editor: 0.174.6 -> 0.175.5

This commit is contained in:
Niklas Korz
2025-02-27 17:23:50 +01:00
parent baca9f36e9
commit e5c850779d
2 changed files with 19 additions and 7 deletions
@@ -1,10 +1,10 @@
diff --git a/script/generate-licenses b/script/generate-licenses
index 9602813f0c..d16d11c203 100755
index 51749a91e2..d3fd7ee351 100755
--- a/script/generate-licenses
+++ b/script/generate-licenses
@@ -16,16 +16,9 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
@@ -16,28 +16,17 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
echo -e "\n# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then
- echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."
@@ -14,8 +14,20 @@ index 9602813f0c..d16d11c203 100755
-fi
echo "Generating cargo licenses"
stderr_file=$(mktemp)
cargo about generate \
- --fail \
-c script/licenses/zed-licenses.toml \
"${TEMPLATE_FILE}" >> $OUTPUT_FILE
"${TEMPLATE_FILE}" \
2> >(tee "$stderr_file") \
>> $OUTPUT_FILE
-if cat "$stderr_file" | grep -v "\[WARN\]" > /dev/null; then
- echo "Error: License check failed - warnings found" >&2
- exit 1
-fi
sed -i.bak 's/"/"/g' $OUTPUT_FILE
sed -i.bak 's/'/'\''/g' $OUTPUT_FILE # The ` '\'' ` thing ends the string, appends a single quote, and re-opens the string
+3 -3
View File
@@ -96,7 +96,7 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
version = "0.174.6";
version = "0.175.5";
outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec {
owner = "zed-industries";
repo = "zed";
tag = "v${version}";
hash = "sha256-X/xGOJBKXRiCfcAyZ0Tiedk9WCnjwA8Ra4TMPf/sYbU=";
hash = "sha256-CeuZv5GFZ9tttpj+4JAgQZcKtPpbE+NxawcW5W0CFws=";
};
patches = [
@@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-EXlV+QFaIErre7Bi06e7V8VKo5SuLdqJQDvQujmBP8o=";
cargoHash = "sha256-UJAH1hCf/p974GNJtvNMzZs8RkxtJQeLhUBCJjLsapU=";
nativeBuildInputs =
[