Commit ee8328f6 authored by Niklas Korz's avatar Niklas Korz
Browse files

zed-editor: 0.224.11 -> 0.225.12

Changelogs:

- https://github.com/zed-industries/zed/releases/tag/v0.225.12
- https://github.com/zed-industries/zed/releases/tag/v0.225.10
- https://github.com/zed-industries/zed/releases/tag/v0.225.9

The `zed::tests::test_window_edit_state_restoring_enabled` test had been
disabled before we switched to cargo-nextest, but is now failing again
for unknown reasons.
parent f20176b4
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zed-editor";
  version = "0.224.11";
  version = "0.225.12";

  outputs = [
    "out"
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${finalAttrs.version}";
    hash = "sha256-VOPAypHlcr7nY3/wk4ec/Ltv+DUf/v4rHDa5oCsg0aE=";
    hash = "sha256-rVJ+NNsnhoXr6y2j2VFrXQVrgbXQY/a6l2Khs36SvDU=";
  };

  postPatch = ''
@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    rm -r $out/git/*/candle-book/
  '';

  cargoHash = "sha256-V61uZEl6LG/xckOajcWugf/K+mJR8Bn9WjqxvvwBbfw=";
  cargoHash = "sha256-i6BZPAKCgomWA/c923/tB9uWtXGr5VXIqmGCYtUUBLM=";

  nativeBuildInputs = [
    cmake
@@ -203,6 +203,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
  ]
  ++ finalAttrs.buildFeatures;

  # cargo-nextest does not support the `=` syntax for parameters, so all test skips must be defined
  # as two separate arguments
  checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
    # Fails on Linux since v0.225, possibly related to https://github.com/zed-industries/zed/pull/48800
    "--skip"
    "zed::tests::test_window_edit_state_restoring_enabled"
  ];

  env = {
    ALLOW_MISSING_LICENSES = true;
    ZSTD_SYS_USE_PKG_CONFIG = true;