Unverified Commit d91510fa authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

zed-editor: 0.174.5 -> 0.174.6 (#383717)

parents a6c808e0 9cb3ccd8

pkgs/by-name/ze/zed-editor/0002-linux-linker.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
diff --git a/.cargo/config.toml b/.cargo/config.toml

index 07cbc23195..b3c4d43e0f 100644

--- a/.cargo/config.toml

+++ b/.cargo/config.toml

@@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]

 [alias]

 xtask = "run --package xtask --"

 

-[target.x86_64-unknown-linux-gnu]

-linker = "clang"

-rustflags = ["-C", "link-arg=-fuse-ld=mold"]

-

-[target.aarch64-unknown-linux-gnu]

-linker = "clang"

-rustflags = ["-C", "link-arg=-fuse-ld=mold"]

-

 [target.aarch64-apple-darwin]

 rustflags = ["-C", "link-args=-Objc -all_load"]

pkgs/by-name/ze/zed-editor/package.nix

+9 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ let 
in

rustPlatform.buildRustPackage rec {

  pname = "zed-editor";

  version = "0.174.5";

  version = "0.174.6";



  outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { 
    owner = "zed-industries";

    repo = "zed";

    tag = "v${version}";

    hash = "sha256-zy0YiCPvLK8jRYldxuPaUfN2/VSPKgqCBu3ZQxZ/mT4=";

    hash = "sha256-X/xGOJBKXRiCfcAyZ0Tiedk9WCnjwA8Ra4TMPf/sYbU=";

  };



  patches = [
@@ -113,6 +113,12 @@ rustPlatform.buildRustPackage rec { 
    # Until https://github.com/zed-industries/zed/issues/19971 is fixed,

    # we also skip any crate for which the license cannot be determined.

    ./0001-generate-licenses.patch



    # Upstream delegates linking on Linux to clang to make use of mold,

    # but builds fine with our standard linker.

    # This patch removes their linker override from the cargo config.

    ./0002-linux-linker.patch



    # See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840

    "script/patches/use-cross-platform-livekit.patch"

  ];
@@ -124,7 +130,7 @@ rustPlatform.buildRustPackage rec { 
  '';



  useFetchCargoVendor = true;

  cargoHash = "sha256-qxLowOIQ0j4ilzCdfiMQQIMfeQHvl5J8GyNJLeJ1GE4=";

  cargoHash = "sha256-EXlV+QFaIErre7Bi06e7V8VKo5SuLdqJQDvQujmBP8o=";



  nativeBuildInputs =

    [