mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
zed-editor: 0.225.13 -> 0.226.4
This commit is contained in:
@@ -107,7 +107,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.225.13";
|
||||
version = "0.226.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ozuycL8dnBtgyYYjsz9C+CDtZQzbXWWZVOkxbOs7hho=";
|
||||
hash = "sha256-vF/vvEJKl1mUcF6TMif5G9rQPjt+2RWImWy1f7RxgfE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-G5U0APQNNEe2qpshqX4QpQGbqIAHllatbbsaVAhDoG0=";
|
||||
cargoHash = "sha256-IH/FEC52VudtXsSHiju6T7H9E2kblJ0RyiUoQR391cc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -192,25 +192,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
# Required on darwin because we don't have access to the
|
||||
# proprietary Metal shader compiler.
|
||||
buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
|
||||
buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui_platform/runtime_shaders" ];
|
||||
|
||||
# Some crates define extra types or enum values in test configuration which then lead
|
||||
# to type checking errors in other crates unless this feature is enabled.
|
||||
# gpui/runtime_shaders is required on darwin for the same reason as buildFeatures above:
|
||||
# gpui_platform/runtime_shaders is required on darwin for the same reason as buildFeatures above:
|
||||
# without it, build.rs invokes the proprietary Metal shader compiler.
|
||||
checkFeatures = [
|
||||
"visual-tests"
|
||||
]
|
||||
++ 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;
|
||||
|
||||
Reference in New Issue
Block a user