From f78de8559bc2630627a60816fcd8cff77f1de107 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Fri, 16 May 2025 20:49:57 +0200 Subject: [PATCH 1/5] zed-editor: 0.186.8 -> 0.186.9 (cherry picked from commit 4c417b6be1ecd9eee7eca22cbef2ed6626ff0f4a) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 3009a0529cf1..5417fbc18484 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.186.8"; + version = "0.186.9"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-oSmwEtF8VWSKcBlL11MMThBAJFisXwWQjZAzcNIptt0="; + hash = "sha256-z3QHD1EfJfhgLZwUv805RHCEKiBm1wCpJG1GAS9OJgE="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-WH6cQa6DChkUtqh+irIz2hJd5/RW/oln+TZPHunEmNk="; + cargoHash = "sha256-qGHUO25a2288hp4+DcQJabauOVGYn7CXtDqWGB6diO8="; nativeBuildInputs = [ From 4823bfd55309287758e8c64810f5ba70e264e454 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Wed, 21 May 2025 22:32:12 +0200 Subject: [PATCH 2/5] zed-editor: 0.186.9 -> 0.187.6 Diff: https://github.com/zed-industries/zed/compare/v0.186.9...v0.187.6 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.187.6 (cherry picked from commit a91b85443ca96a1a0be3c76eda7c940e4454feee) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 5417fbc18484..71171c8a6106 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.186.9"; + version = "0.187.6"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-z3QHD1EfJfhgLZwUv805RHCEKiBm1wCpJG1GAS9OJgE="; + hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-qGHUO25a2288hp4+DcQJabauOVGYn7CXtDqWGB6diO8="; + cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg="; nativeBuildInputs = [ From 89b290070b2ce3c5904ffeec88c44a88eae2dd08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 19:50:42 +0000 Subject: [PATCH 3/5] zed-editor: 0.187.6 -> 0.187.9 (cherry picked from commit 4f081b542669e986df05cf7006a701de736200ee) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 71171c8a6106..c38458f5b57a 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.187.6"; + version = "0.187.9"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo="; + hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg="; + cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8="; nativeBuildInputs = [ From 0ff2bea43eadc9bb15765c3f230be6a26eb4225c Mon Sep 17 00:00:00 2001 From: seeker Date: Thu, 29 May 2025 18:26:04 +0800 Subject: [PATCH 4/5] zed-editor: 0.186.9 -> 0.188.3 (cherry picked from commit f76714dc442ea29f07d9f4d7426ffb0a54e353c2) --- pkgs/by-name/ze/zed-editor/0001-linux-linker.patch | 8 ++++---- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch index 4529e038dc2f..5deef7339a72 100644 --- a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch +++ b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index 07cbc23195..b3c4d43e0f 100644 +index 717c5e1..0bb7b6c 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"] @@ -14,6 +14,6 @@ index 07cbc23195..b3c4d43e0f 100644 -linker = "clang" -rustflags = ["-C", "link-arg=-fuse-ld=mold"] - - [target.aarch64-apple-darwin] - rustflags = ["-C", "link-args=-Objc -all_load"] - + [target.'cfg(target_os = "windows")'] + rustflags = [ + "--cfg", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index c38458f5b57a..1730a70423c0 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.187.9"; + version = "0.188.3"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4="; + hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8="; + cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA="; nativeBuildInputs = [ From b5f7015d520e2822d46882560bd39114919d6727 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 7 Jun 2025 18:38:22 +0200 Subject: [PATCH 5/5] zed-editor: 0.188.3 -> 0.189.5 Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.188.3...v0.189.5 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.189.5 (cherry picked from commit 9e783da4169c27243a2234a459f25583273a52f6) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 1730a70423c0..9a0787af7f57 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.188.3"; + version = "0.189.5"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg="; + hash = "sha256-d1d3WgUVamrYWVosljQiEPZGNNDldtM1YwZhxseX4+w="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA="; + cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk="; nativeBuildInputs = [