zed-editor: 0.184.10 -> 0.185.15 by sachk · Pull Request #404938 · NixOS/nixpkgs

sachk · 2025-05-07T14:23:12Z

Diff

Fixes #404990

Note: this PR is currently blocked by issues with the vendoring of cargo dependencies.
See: #387337 and #282798

Things done

Add a 👍 reaction to pull requests you find important.

sachk · 2025-05-07T14:40:24Z

Oh, looks like we need #387337? Not sure why that didn't show up locally.

GaetanLepage · 2025-05-07T14:40:38Z

Eval has failed for some reason. Can you please rebase and force-push?

GaetanLepage · 2025-05-07T14:48:53Z

Thanks, but you have introduced a merge commit instead of rebasing. Can you properly rebase and then force-push so as to have a single commit on your branch?.

GaetanLepage · 2025-05-07T15:00:01Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 404938

`x86_64-linux`

❌ 3 packages failed to build:

zed-editor
zed-editor-fhs
zed-editor.remote_server

`aarch64-linux`

❌ 3 packages failed to build:

zed-editor
zed-editor-fhs
zed-editor.remote_server

`x86_64-darwin`

❌ 2 packages failed to build:

zed-editor
zed-editor.remote_server

`aarch64-darwin`

❌ 2 packages failed to build:

zed-editor
zed-editor.remote_server

sachk · 2025-05-07T15:01:27Z

Thanks, but you have introduced a merge commit instead of rebasing. Can you properly rebase and then force-push so as to have a single commit on your branch?.

Yeah, sorry I assumed github wouldn't do that with the UI and then it took me a moment to fetch nixpkgs master to fix it. I'm not sure it'll fix the issue given I was only about 20 commits behind though.

I assume it's the issue fixed by #387337 given this seems to be the issue in the logs.

       > FileExistsError: [Errno 17] File exists: '/nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15'

drupol

Diff LGTM, thanks for this !

drupol · 2025-05-07T15:13:20Z

What is this build issue ?

Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.11.27
Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15
Copying to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15
Traceback (most recent call last):
  File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 349, in <module>
    main()
  File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 345, in main
    subcommand_func()
  File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 337, in <lambda>
    "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3]))
                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 294, in create_vendor
    copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir)
  File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 233, in copy_and_patch_git_crate_subtree
    shutil.copytree(crate_tree, crate_out_dir, ignore=ignore_func)
  File "/nix/store/kjvgj2n3yn70hmjifg6y0bk9m4rf7jba-python3-3.12.10/lib/python3.12/shutil.py", line 600, in copytree
    return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/kjvgj2n3yn70hmjifg6y0bk9m4rf7jba-python3-3.12.10/lib/python3.12/shutil.py", line 498, in _copytree
    os.makedirs(dst, exist_ok=dirs_exist_ok)
  File "<frozen os>", line 225, in makedirs
FileExistsError: [Errno 17] File exists: '/nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15'
error: builder for '/nix/store/8505v76g1swshr3fh0gwrzl0gngrcm40-zed-editor-0.185.10-vendor.drv' failed with exit code 1;
       last 25 log lines:
       > Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/regex-syntax-0.6.29
       > Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/regex-syntax-0.8.5
       > Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/rend-0.4.2
       > Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.11.27
       > Unpacking to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15
       > Copying to /nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15
       > Traceback (most recent call last):
       >   File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 349, in <module>
       >     main()
       >   File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 345, in main
       >     subcommand_func()
       >   File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 337, in <lambda>
       >     "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3]))
       >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
       >   File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 294, in create_vendor
       >     copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir)
       >   File "/nix/store/j8vmynm6m361ai674awq2l43gqyjqh8j-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 233, in copy_and_patch_git_crate_subtree
       >     shutil.copytree(crate_tree, crate_out_dir, ignore=ignore_func)
       >   File "/nix/store/kjvgj2n3yn70hmjifg6y0bk9m4rf7jba-python3-3.12.10/lib/python3.12/shutil.py", line 600, in copytree
       >     return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
       >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
       >   File "/nix/store/kjvgj2n3yn70hmjifg6y0bk9m4rf7jba-python3-3.12.10/lib/python3.12/shutil.py", line 498, in _copytree
       >     os.makedirs(dst, exist_ok=dirs_exist_ok)
       >   File "<frozen os>", line 225, in makedirs
       > FileExistsError: [Errno 17] File exists: '/nix/store/a7b10d819rsr329czk7473600gw9j835-zed-editor-0.185.10-vendor/reqwest-0.12.15'
       For full logs, run 'nix log /nix/store/8505v76g1swshr3fh0gwrzl0gngrcm40-zed-editor-0.185.10-vendor.drv'.
error: 1 dependencies of derivation '/nix/store/4rqin9xh90ndd9jvsrgx0pwg8l8bh9d8-zed-editor-0.185.10.drv' failed to build
error: 1 dependencies of derivation '/nix/store/blhkg43sgxyl0sqwkp9rjl0wvgbj5zkk-zed-editor-0.185.10.drv' failed to build
error: 1 dependencies of derivation '/nix/store/c14sqxlmmnk5s30mpa3pxabcgcyzicim-zed-editor-0.185.10-test-version.drv' failed to build
error: build of '/nix/store/4rqin9xh90ndd9jvsrgx0pwg8l8bh9d8-zed-editor-0.185.10.drv', '/nix/store/blhkg43sgxyl0sqwkp9rjl0wvgbj5zkk-zed-editor-0.185.10.drv', '/nix/store/c14sqxlmmnk5s30mpa3pxabcgcyzicim-zed-editor-0.185.10-test-version.drv' failed

sachk · 2025-05-07T15:15:42Z

What is this build issue ?

Has to be #359340 right? Due to changes in dependencies in this new zed version.

HPsaucii · 2025-05-07T17:33:37Z

Can confirm i get the same issue with my own local version bump - my line of research has also led to what @sachk linked. I haven't found any info on how to directly get around this without #282798 unfortunately

nyabinary · 2025-05-07T21:11:43Z

This is seriously starting to get be a PITA, we got to get that merged as soon as possible atp.

linuxmobile · 2025-05-07T23:31:31Z

v0.185.11 is out

drupol · 2025-05-08T05:19:43Z

0.185.12 now

sachk · 2025-05-08T09:53:40Z

looks like that hasn't fixed it :(

HPsaucii · 2025-05-08T09:56:05Z

looks like that hasn't fixed it :(

Yeah, im currently working on a flake that uses the patched rustPlatform, but i'm having issues with dependency patching (the way the new rustPlatform does dependencies breaks the current solution to the webrtc-sys dependency)

HPsaucii · 2025-05-08T12:59:04Z

For anyone who want's to test out the latest version before the breaking change gets pushed (or this pull request gets resolved through some other means), I've made https://github.com/HPsaucii/zed-editor-flake

I haven't had the time to fully build it yet, but everything should work fine :)

TomaSajt · 2025-05-08T15:25:49Z

(the way the new rustPlatform does dependencies breaks the current solution to the webrtc-sys dependency)

FYI: in theory, you just have to swap out $cargoDepsCopy/webrtc-sys-* to $cargoDepsCopy/*/webrtc-sys-* when using my PR.

TomaSajt · 2025-05-08T15:43:46Z

Also:

this patch should fix the duplication issue without my fix PR:

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 09d3748497dd..82b1adb52b70 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -121,6 +121,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./0001-linux-linker.patch
   ];
 
+  cargoPatches = [
+    # reqwest 0.12.15 is present both as a git-based crate and as the plain crates.io crate
+    ./remove-duplicate-dep.patch
+  ];
+
   postPatch =
     # Dynamically link WebRTC instead of static
     ''
@@ -129,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VPg7gSfGO7WM/1NFEZqTaVZKzcOwkwHrA2CjnW0bevY=";
+  cargoHash = "sha256-K/cK90Y1hfFl0kFw/G+6z/4GnSpx/38SwwtoEervGHk=";
 
   nativeBuildInputs =
     [
diff --git a/pkgs/by-name/ze/zed-editor/remove-duplicate-dep.patch b/pkgs/by-name/ze/zed-editor/remove-duplicate-dep.patch
new file mode 100644
index 000000000000..6d6dd619cb53
--- /dev/null
+++ b/pkgs/by-name/ze/zed-editor/remove-duplicate-dep.patch
@@ -0,0 +1,48 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 22427fb..75a924a 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -12162,43 +12162,6 @@ dependencies = [
+  "winreg 0.50.0",
+ ]
+ 
+-[[package]]
+-name = "reqwest"
+-version = "0.12.15"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+-dependencies = [
+- "base64 0.22.1",
+- "bytes 1.10.1",
+- "futures-channel",
+- "futures-core",
+- "futures-util",
+- "http 1.3.1",
+- "http-body 1.0.1",
+- "http-body-util",
+- "hyper 1.6.0",
+- "hyper-util",
+- "ipnet",
+- "js-sys",
+- "log",
+- "mime",
+- "once_cell",
+- "percent-encoding",
+- "pin-project-lite",
+- "serde",
+- "serde_json",
+- "serde_urlencoded",
+- "sync_wrapper 1.0.2",
+- "tokio",
+- "tower 0.5.2",
+- "tower-service",
+- "url",
+- "wasm-bindgen",
+- "wasm-bindgen-futures",
+- "web-sys",
+- "windows-registry 0.4.0",
+-]
+-
+ [[package]]
+ name = "reqwest"
+ version = "0.12.15"

nyabinary · 2025-05-08T15:44:33Z

0.185.12 now

.13 now

TomaSajt · 2025-05-08T15:56:25Z

Also:

this patch should fix the duplication issue without my fix PR:

Nevermind, doesn't work...

HPsaucii · 2025-05-08T16:16:06Z

(the way the new rustPlatform does dependencies breaks the current solution to the webrtc-sys dependency)

FYI: in theory, you just have to swap out $cargoDepsCopy/webrtc-sys-* to $cargoDepsCopy/*/webrtc-sys-* when using my PR.

yup, figured that one out on my own, as seen in the flake i linked above

HPsaucii · 2025-05-08T16:18:18Z

also @TomaSajt i experimented with patching the cargo.lock / cargo.toml directly, and couldn't get it to work. Either way, it would be pretty bad form to include that sort of fix to nixpkgs.

TomaSajt · 2025-05-08T16:25:57Z

also @TomaSajt i experimented with patching the cargo.lock / cargo.toml directly, and couldn't get it to work. Either way, it would be pretty bad form to include that sort of fix to nixpkgs.

I agree it's very hacky, but I don't think it's necessarily wrong to include in nixpkgs, IMO.
(There are already other patches like this, all of which my fix PR gets rid of)

If we're lucky, the git based crate only contains changes compared to the crates-io crate that don't change the API.
Sadly, we were not lucky in this case.

HPsaucii · 2025-05-08T16:57:04Z

fair enough, either way, this probably isn't getting merged. Im just working on the version bump to v0.185.13, a binary package (done), and exposed FHS packages, and then i'll push to my flake again

HPsaucii · 2025-05-08T19:00:40Z

new changes to https://github.com/HPsaucii/zed-editor-flake have been pushed, has v0.185.13, fhs, and binary build support. It should be in a state usable by most people. (except maybe mac users)

itpropro · 2025-05-08T21:00:29Z

new changes to https://github.com/HPsaucii/zed-editor-flake have been pushed, has v0.185.13, fhs, and binary build support. It should be in a state usable by most people. (except maybe mac users)

Used that before the last commit on NixOS. Took 20 minutes, but compiled and resulted in a up to date version, thank you!

itpropro · 2025-05-11T13:42:24Z

.14 and .15 also released in the meantime. Just keeping this up to date.
We are now at ~~0.185.15~~ 0.185.16

EDIT (2025-05-12): Updated to 0.185.16

Tebro · 2025-05-13T11:00:15Z

I just checked this PR out and tried to build with nix-build -A zed-editor and I get an error FileExistsError: [Errno 17] File exists: '/nix/store/sl33abmiggzv72scik2xb598wkbyq0v2-zed-editor-0.185.15-vendor/reqwest-0.12.15'

Edit: never mind, I just now see that it is the same error posted above.

HPsaucii · 2025-05-13T12:23:13Z

@Tebro yeah, in the meantime I'd suggest https://github.com/HPsaucii/zed-editor-flake

niklaskorz · 2025-05-14T15:37:51Z

Superseded by #407051

NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label May 7, 2025

github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 7, 2025

nix-owners bot requested review from GaetanLepage and niklaskorz May 7, 2025 14:31

sachk force-pushed the zed-editor branch from 87a50c7 to 47bef48 Compare May 7, 2025 15:00

drupol approved these changes May 7, 2025

View reviewed changes

itpropro mentioned this pull request May 7, 2025

Improve flake.nix zed-industries/zed#26277

Open

13 tasks

drupol changed the title ~~zed-editor: 0.184.10 -> 0.185.10~~ zed-editor: 0.184.10 -> 0.185.12 May 8, 2025

PedroHLC mentioned this pull request May 8, 2025

cargo vendor can't vendor reqwest dependency with different sources zed-industries/zed#30093

Closed

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

zed-editor: 0.184.10 -> 0.185.15

4773a4a

sachk force-pushed the zed-editor branch from df9ed27 to 4773a4a Compare May 12, 2025 16:03

sachk changed the title ~~zed-editor: 0.184.10 -> 0.185.12~~ zed-editor: 0.184.10 -> 0.185.15 May 12, 2025

niklaskorz closed this May 14, 2025

TomaSajt mentioned this pull request May 14, 2025

zed-editor: 0.184.10 -> 0.186.8 #407051

Merged

13 tasks

Uh oh!

Conversation

sachk commented May 7, 2025 • edited by TomaSajt Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

sachk commented May 7, 2025

Uh oh!

GaetanLepage commented May 7, 2025

Uh oh!

GaetanLepage commented May 7, 2025

Uh oh!

GaetanLepage commented May 7, 2025

nixpkgs-review result

x86_64-linux

aarch64-linux

x86_64-darwin

aarch64-darwin

Uh oh!

sachk commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

drupol left a comment

Choose a reason for hiding this comment

Uh oh!

drupol commented May 7, 2025

Uh oh!

sachk commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HPsaucii commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nyabinary commented May 7, 2025

Uh oh!

linuxmobile commented May 7, 2025

Uh oh!

drupol commented May 8, 2025

Uh oh!

sachk commented May 8, 2025

Uh oh!

HPsaucii commented May 8, 2025

Uh oh!

HPsaucii commented May 8, 2025

Uh oh!

TomaSajt commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TomaSajt commented May 8, 2025

Uh oh!

nyabinary commented May 8, 2025

Uh oh!

TomaSajt commented May 8, 2025

Uh oh!

HPsaucii commented May 8, 2025

Uh oh!

HPsaucii commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TomaSajt commented May 8, 2025

Uh oh!

HPsaucii commented May 8, 2025

Uh oh!

HPsaucii commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

itpropro commented May 8, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

itpropro commented May 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

Tebro commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HPsaucii commented May 13, 2025

Uh oh!

sachk commented May 7, 2025 •

edited by TomaSajt

Loading

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

`x86_64-darwin`

`aarch64-darwin`

sachk commented May 7, 2025 •

edited

Loading

sachk commented May 7, 2025 •

edited

Loading

HPsaucii commented May 7, 2025 •

edited

Loading

TomaSajt commented May 8, 2025 •

edited

Loading

HPsaucii commented May 8, 2025 •

edited

Loading

HPsaucii commented May 8, 2025 •

edited

Loading

itpropro commented May 11, 2025 •

edited

Loading

Tebro commented May 13, 2025 •

edited

Loading