From 941cf99422f218fd26e83b29b49c1f1f02a59cd6 Mon Sep 17 00:00:00 2001 From: Benjamin Kitt Date: Mon, 3 Mar 2025 19:48:28 -0600 Subject: [PATCH] zed-editor: 0.175.5 -> 0.176.1 --- .../zed-editor/0001-generate-licenses.patch | 23 +++++-------------- pkgs/by-name/ze/zed-editor/package.nix | 6 ++--- 2 files changed, 9 insertions(+), 20 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 0749f4911cf8..d3f566488090 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 51749a91e2..d3fd7ee351 100755 +index 368f63b..c2bf3a5 100644 --- a/script/generate-licenses +++ b/script/generate-licenses -@@ -16,28 +16,17 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE - - echo -e "\n# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE +@@ -18,17 +18,9 @@ echo -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..." @@ -12,22 +12,11 @@ index 51749a91e2..d3fd7ee351 100755 -else - echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." -fi - +- echo "Generating cargo licenses" - stderr_file=$(mktemp) - cargo about generate \ - --fail \ -c script/licenses/zed-licenses.toml \ - "${TEMPLATE_FILE}" \ - 2> >(tee "$stderr_file") \ - >> $OUTPUT_FILE + "$TEMPLATE_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 diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index aee759615252..42cc22bf9ee8 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.175.5"; + version = "0.176.1"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-CeuZv5GFZ9tttpj+4JAgQZcKtPpbE+NxawcW5W0CFws="; + hash = "sha256-Onf3mce327oLbvBPTkJIzJNAf145/ogFK+J6+Asuh9w="; }; patches = [ @@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-UJAH1hCf/p974GNJtvNMzZs8RkxtJQeLhUBCJjLsapU="; + cargoHash = "sha256-hlX4IMpsEqwYrzDvzFUhh6PVqM9U+4kp/bBYG08BPQA="; nativeBuildInputs = [