From e5c850779dad4b97d52678d45c7b256973b28c8d Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 27 Feb 2025 15:59:39 +0100
Subject: [PATCH] zed-editor: 0.174.6 -> 0.175.5

---
 .../zed-editor/0001-generate-licenses.patch   | 20 +++++++++++++++----
 pkgs/by-name/ze/zed-editor/package.nix        |  6 +++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
index b5c804da5459..0749f4911cf8 100644
--- a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
+++ b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
@@ -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/&quot;/"/g' $OUTPUT_FILE
+ sed -i.bak 's/&#x27;/'\''/g' $OUTPUT_FILE # The ` '\'' ` thing ends the string, appends a single quote, and re-opens the string
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index e20319e1cc42..aee759615252 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -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 =
     [