zed-editor: 0.174.6 -> 0.175.5 (#385589)

authored by Pol Dellaiera and committed by GitHub 8bddce70 8e372bfc

+19 -7
+16 -4
pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
··· 1 1 diff --git a/script/generate-licenses b/script/generate-licenses 2 - index 9602813f0c..d16d11c203 100755 2 + index 51749a91e2..d3fd7ee351 100755 3 3 --- a/script/generate-licenses 4 4 +++ 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 6 6 7 - echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE 7 + echo -e "\n# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE 8 8 9 9 -if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then 10 10 - echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." ··· 14 14 -fi 15 15 16 16 echo "Generating cargo licenses" 17 + 18 + stderr_file=$(mktemp) 19 + 17 20 cargo about generate \ 18 21 - --fail \ 19 22 -c script/licenses/zed-licenses.toml \ 20 - "${TEMPLATE_FILE}" >> $OUTPUT_FILE 23 + "${TEMPLATE_FILE}" \ 24 + 2> >(tee "$stderr_file") \ 25 + >> $OUTPUT_FILE 21 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 31 + 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
+3 -3
pkgs/by-name/ze/zed-editor/package.nix
··· 96 96 in 97 97 rustPlatform.buildRustPackage rec { 98 98 pname = "zed-editor"; 99 - version = "0.174.6"; 99 + version = "0.175.5"; 100 100 101 101 outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; 102 102 ··· 104 104 owner = "zed-industries"; 105 105 repo = "zed"; 106 106 tag = "v${version}"; 107 - hash = "sha256-X/xGOJBKXRiCfcAyZ0Tiedk9WCnjwA8Ra4TMPf/sYbU="; 107 + hash = "sha256-CeuZv5GFZ9tttpj+4JAgQZcKtPpbE+NxawcW5W0CFws="; 108 108 }; 109 109 110 110 patches = [ ··· 130 130 ''; 131 131 132 132 useFetchCargoVendor = true; 133 - cargoHash = "sha256-EXlV+QFaIErre7Bi06e7V8VKo5SuLdqJQDvQujmBP8o="; 133 + cargoHash = "sha256-UJAH1hCf/p974GNJtvNMzZs8RkxtJQeLhUBCJjLsapU="; 134 134 135 135 nativeBuildInputs = 136 136 [