diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 35d40ff53735..d3f447d91d94 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -97,7 +97,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.231.2"; + version = "0.232.2"; outputs = [ "out" @@ -110,10 +110,13 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-o64xjJKvGzn4H1nMVVbqx+XFxDwHyFwnO+OoNJB04OI="; + hash = "sha256-S7N9R5VUcJP+yq0S6s4zeQQhSFSdDovtoL9FL1BEg2U="; }; postPatch = '' + # Disable upstream's rustflags overrides to avoid linker issues + rm .cargo/config.toml + # Dynamically link WebRTC instead of static substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" @@ -136,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-++2q4zeLBDSW4ooTu7dU77YsuHggeX/sWkvuCb3PF50="; + cargoHash = "sha256-WpEPQw3GOemxjyfDH7VH3FURpkYVfVyXQiALJsccwQ4="; __structuredAttrs = true; @@ -223,6 +226,14 @@ rustPlatform.buildRustPackage (finalAttrs: { writableTmpDirAsHomeHook ]; + # These two tests trigger GUI prompts that hang in the headless Nix build sandbox. + checkFlags = [ + "--skip" + "zed::open_listener::tests::test_e2e_prompt_user_picks_existing_window" + "--skip" + "zed::open_listener::tests::test_e2e_prompt_user_picks_new_window" + ]; + useNextest = true; remoteServerExecutableName = "zed-remote-server-${channel}-${finalAttrs.version}+${channel}";