Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zed-editor: 0.129.2 -> 0.130.6 #303233

Merged
merged 2 commits into from
Apr 12, 2024
Merged

zed-editor: 0.129.2 -> 0.130.6 #303233

merged 2 commits into from
Apr 12, 2024

Conversation

GaetanLepage
Copy link
Contributor

@GaetanLepage GaetanLepage commented Apr 10, 2024

Description of changes

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.130.6

cc @jansol

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 303233 run on aarch64-darwin 1

1 package failed to build:
  • zed-editor

@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 303233 run on x86_64-darwin 1

1 package failed to build:
  • zed-editor

@GaetanLepage
Copy link
Contributor Author

nixpkgs-review fail on darwin when using the nix-community darwin builder:

sandbox-exec: pattern serialization length 71524 exceeds maximum (65535)

Could someone owning a mac check if this new version builds fine please ?

@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 303233 run on aarch64-linux 1

1 package failed to build:
  • zed-editor

@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 303233 run on x86_64-linux 1

1 package failed to build:
  • zed-editor

@GaetanLepage
Copy link
Contributor Author

failures:

---- zed::tests::test_disabled_keymap_binding stdout ----
thread 'zed::tests::test_disabled_keymap_binding' panicked at crates/zed/src/zed.rs:664:48:
called `Result::unwrap()` on an `Err` value: Invalid keystroke `cmd-k`
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


failures:
    zed::tests::test_disabled_keymap_binding

test result: FAILED. 17 passed; 1 failed; 0 ignored; 0 measured; 1 filtered out; finished in 3.34s

@jansol
Copy link
Contributor

jansol commented Apr 10, 2024

called Result::unwrap() on an Err value: Invalid keystroke cmd-k
note: run with RUST_BACKTRACE=1 environment variable to display a backtrace

failures:
zed::tests::test_disabled_keymap_binding

test result: FAILED. 17 passed; 1 failed; 0 ignored; 0 measured; 1 filtered out; finished in 1.29s

Yeah I imagine that'd fail on Linux

@niklaskorz
Copy link
Contributor

niklaskorz commented Apr 11, 2024

nixpkgs-review fail on darwin when using the nix-community darwin builder:

sandbox-exec: pattern serialization length 71524 exceeds maximum (65535)

Could someone owning a mac check if this new version builds fine please ?

on it :)

Edit:

error: failed to run custom build command for `live_kit_client v0.1.0 (/private/tmp/nix-build-zed-0.130.5.drv-0/source/crates/live_kit_client)`

Caused by:
  process didn't exit successfully: `/private/tmp/nix-build-zed-0.130.5.drv-0/source/target/release/build/live_kit_client-2bd9642389c89a37/build-script-build` (exit status: 101)
  --- stderr
  thread 'main' panicked at crates/live_kit_client/build.rs:130:10:
  called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" }
  note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Edit 2: This error is also the case for the already merged nixpkgs version of zed. There are no cached darwin binaries for it and letting it try to build it from source results in the above error. I'll have a look tomorrow into which path is missing here.

Edit 3: It's because of LiveKitBridge, a Swift package inside Zed. It's disabled on Linux, but enabled on macOS. So two options: disable it on macOS too, or see how we can incorporate swiftpm2nix here. build.rs needs direct access to swift for compiling LiveKitBridge.

@GaetanLepage
Copy link
Contributor Author

failures:

---- zed::tests::test_disabled_keymap_binding stdout ----
thread 'zed::tests::test_disabled_keymap_binding' panicked at crates/zed/src/zed.rs:664:48:
called `Result::unwrap()` on an `Err` value: Invalid keystroke `cmd-k`
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


failures:
    zed::tests::test_disabled_keymap_binding

test result: FAILED. 17 passed; 1 failed; 0 ignored; 0 measured; 1 filtered out; finished in 3.34s

Should we skip this test on Linux ?

@jansol
Copy link
Contributor

jansol commented Apr 11, 2024

I think this is really something that upstream should fix. But it should not affect users (much) so it's probably sensible to skip the test until upstream has time to address it.

@jansol
Copy link
Contributor

jansol commented Apr 11, 2024

Okay apparently this does cause panics for users after updating so let's hold off of this for a bit.

@GaetanLepage GaetanLepage changed the title zed-editor: 0.129.2 -> 0.130.5 zed-editor: 0.129.2 -> 0.130.6 Apr 11, 2024
@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 303233 run on x86_64-linux 1

1 package built:
  • zed-editor

@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 303233 run on aarch64-linux 1

1 package built:
  • zed-editor

@SuperSandro2000
Copy link
Member

What do we do with darwin?

@niklaskorz
Copy link
Contributor

What do we do with darwin?

I'd be fine with working on a fix in a separate PR, and marking darwin as broken in this one for now so it's not blocking the update

@GaetanLepage
Copy link
Contributor Author

I marked it as broken on darwin. Feel free to merge whenever you feel like it @SuperSandro2000, good for me.

@wegank wegank merged commit 8ff402c into NixOS:master Apr 12, 2024
26 checks passed
@GaetanLepage GaetanLepage deleted the zed branch April 12, 2024 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants