lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

zed-editor: 0.177.11 -> 0.178.5 (#391630)

authored by

Pol Dellaiera and committed by
GitHub
7cd55514 a2ee1a50

+5 -32
-22
pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
··· 1 - diff --git a/script/generate-licenses b/script/generate-licenses 2 - index 368f63b..c2bf3a5 100644 3 - --- a/script/generate-licenses 4 - +++ b/script/generate-licenses 5 - @@ -18,17 +18,9 @@ echo -n "" > "$OUTPUT_FILE" 6 - echo -e "\n# ###### CODE LICENSES ######\n" 7 - } >> "$OUTPUT_FILE" 8 - 9 - -if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then 10 - - echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." 11 - - cargo install "cargo-about@$CARGO_ABOUT_VERSION" 12 - -else 13 - - echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." 14 - -fi 15 - - 16 - echo "Generating cargo licenses" 17 - 18 - cargo about generate \ 19 - - --fail \ 20 - -c script/licenses/zed-licenses.toml \ 21 - "$TEMPLATE_FILE" >> "$OUTPUT_FILE" 22 -
pkgs/by-name/ze/zed-editor/0002-linux-linker.patch pkgs/by-name/ze/zed-editor/0001-linux-linker.patch
+5 -10
pkgs/by-name/ze/zed-editor/package.nix
··· 98 98 in 99 99 rustPlatform.buildRustPackage (finalAttrs: { 100 100 pname = "zed-editor"; 101 - version = "0.177.11"; 101 + version = "0.178.5"; 102 102 103 103 outputs = 104 104 [ "out" ] ··· 110 110 owner = "zed-industries"; 111 111 repo = "zed"; 112 112 tag = "v${finalAttrs.version}"; 113 - hash = "sha256-cnzaW0paORio8AONtVVGUZWG+HsWte12aWK2qvfj8oI="; 113 + hash = "sha256-YkoIOBoR5hMt99D1bJ1yWLv7C/rY6VKC5J/7c5SMUFs="; 114 114 }; 115 115 116 116 patches = [ 117 - # Zed uses cargo-install to install cargo-about during the script execution. 118 - # We provide cargo-about ourselves and can skip this step. 119 - # Until https://github.com/zed-industries/zed/issues/19971 is fixed, 120 - # we also skip any crate for which the license cannot be determined. 121 - ./0001-generate-licenses.patch 122 - 123 117 # Upstream delegates linking on Linux to clang to make use of mold, 124 118 # but builds fine with our standard linker. 125 119 # This patch removes their linker override from the cargo config. 126 - ./0002-linux-linker.patch 120 + ./0001-linux-linker.patch 127 121 128 122 # See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840 129 123 "script/patches/use-cross-platform-livekit.patch" ··· 136 130 ''; 137 131 138 132 useFetchCargoVendor = true; 139 - cargoHash = "sha256-Hl5QWU9yKXedQFVd60Fz5O7B2e/YUqj3BLNmqC44UP0="; 133 + cargoHash = "sha256-xJaiHngsm74RdcEUXaDrc/Hwy4ywZrEiJt7JYTc/NpM="; 140 134 141 135 nativeBuildInputs = 142 136 [ ··· 192 186 buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ]; 193 187 194 188 env = { 189 + ALLOW_MISSING_LICENSES = true; 195 190 ZSTD_SYS_USE_PKG_CONFIG = true; 196 191 FONTCONFIG_FILE = makeFontsConf { 197 192 fontDirectories = [