zed: Update to 0.127.5
Still doesn't work on wayland though...
This commit is contained in:
parent
59264113f9
commit
2e5d7a110a
2 changed files with 68 additions and 36 deletions
2
pkgs/zed/Cargo.lock
generated
2
pkgs/zed/Cargo.lock
generated
|
@ -12758,7 +12758,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zed"
|
name = "zed"
|
||||||
version = "0.127.3"
|
version = "0.127.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"activity_indicator",
|
"activity_indicator",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
|
|
@ -5,31 +5,32 @@
|
||||||
curl,
|
curl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
protobuf,
|
protobuf,
|
||||||
|
xcbuild,
|
||||||
fontconfig,
|
fontconfig,
|
||||||
freetype,
|
freetype,
|
||||||
libgit2,
|
libgit2,
|
||||||
libxkbcommon,
|
|
||||||
openssl,
|
openssl,
|
||||||
sqlite,
|
sqlite,
|
||||||
vulkan-loader,
|
|
||||||
xorg,
|
|
||||||
zlib,
|
zlib,
|
||||||
zstd,
|
zstd,
|
||||||
|
alsa-lib,
|
||||||
|
libxkbcommon,
|
||||||
|
wayland,
|
||||||
|
xorg,
|
||||||
stdenv,
|
stdenv,
|
||||||
darwin,
|
darwin,
|
||||||
alsa-lib,
|
vulkan-loader,
|
||||||
wayland,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "zed";
|
pname = "zed";
|
||||||
version = "0.127.3";
|
version = "0.127.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zed-industries";
|
owner = "zed-industries";
|
||||||
repo = "zed";
|
repo = "zed";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-qzQ0mOY8/reyQqTddG5nqtXDcyPJvrz/HUFci6fNums=";
|
hash = "sha256-clMPXz6htCGoX7wcONo68kacPSvgrAd6SH5VDHSGyOM=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -83,14 +84,12 @@ rustPlatform.buildRustPackage rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
curl
|
curl
|
||||||
pkg-config
|
pkg-config
|
||||||
protobuf
|
protobuf
|
||||||
rustPlatform.bindgenHook
|
rustPlatform.bindgenHook
|
||||||
];
|
] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
|
@ -98,45 +97,78 @@ rustPlatform.buildRustPackage rec {
|
||||||
fontconfig
|
fontconfig
|
||||||
freetype
|
freetype
|
||||||
libgit2
|
libgit2
|
||||||
libxkbcommon
|
|
||||||
openssl
|
openssl
|
||||||
sqlite
|
sqlite
|
||||||
vulkan-loader
|
|
||||||
xorg.libxcb
|
|
||||||
zlib
|
zlib
|
||||||
zstd
|
zstd
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isDarwin [
|
|
||||||
darwin.apple_sdk.frameworks.AppKit
|
|
||||||
darwin.apple_sdk.frameworks.CoreAudio
|
|
||||||
darwin.apple_sdk.frameworks.CoreFoundation
|
|
||||||
darwin.apple_sdk.frameworks.CoreGraphics
|
|
||||||
darwin.apple_sdk.frameworks.CoreServices
|
|
||||||
darwin.apple_sdk.frameworks.CoreText
|
|
||||||
darwin.apple_sdk.frameworks.Foundation
|
|
||||||
darwin.apple_sdk.frameworks.IOKit
|
|
||||||
darwin.apple_sdk.frameworks.Metal
|
|
||||||
darwin.apple_sdk.frameworks.Security
|
|
||||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.isLinux [
|
++ lib.optionals stdenv.isLinux [
|
||||||
alsa-lib
|
alsa-lib
|
||||||
|
libxkbcommon
|
||||||
wayland
|
wayland
|
||||||
];
|
xorg.libxcb
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.isDarwin (
|
||||||
|
with darwin.apple_sdk.frameworks;
|
||||||
|
[
|
||||||
|
AppKit
|
||||||
|
CoreAudio
|
||||||
|
CoreFoundation
|
||||||
|
CoreGraphics
|
||||||
|
CoreMedia
|
||||||
|
CoreServices
|
||||||
|
CoreText
|
||||||
|
Foundation
|
||||||
|
IOKit
|
||||||
|
Metal
|
||||||
|
Security
|
||||||
|
SystemConfiguration
|
||||||
|
VideoToolbox
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
buildFeatures = [ "gpui/runtime_shaders" ];
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postFixup = lib.optionalString stdenv.isLinux ''
|
||||||
|
patchelf --add-rpath ${vulkan-loader}/lib $out/bin/*
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Fail with "unimplemented error"
|
||||||
|
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
|
"--skip=test_base_keymap"
|
||||||
|
"--skip=test_bundled_settings_and_themes"
|
||||||
|
"--skip=test_disabled_keymap_binding"
|
||||||
|
"--skip=test_navigation"
|
||||||
|
"--skip=test_new_empty_workspace"
|
||||||
|
"--skip=test_open_and_save_new_file"
|
||||||
|
"--skip=test_open_entry"
|
||||||
|
"--skip=test_opening_excluded_paths"
|
||||||
|
"--skip=test_open_paths"
|
||||||
|
"--skip=test_open_paths_action"
|
||||||
|
"--skip=test_pane_actions"
|
||||||
|
"--skip=test_reopening_closed_items"
|
||||||
|
"--skip=test_save_conflicting_item"
|
||||||
|
"--skip=test_setting_language_when_saving_as_single_file_worktree"
|
||||||
|
"--skip=test_window_edit_state"
|
||||||
|
"--skip=test_open_add_new"
|
||||||
|
"--skip=test_open_file_in_many_spaces"
|
||||||
|
"--skip=test_open_non_existing_file"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
|
description = "A high-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
|
||||||
homepage = "https://github.com/zed-industries/zed";
|
homepage = "https://zed.dev";
|
||||||
license = with licenses; [
|
changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}";
|
||||||
asl20
|
license = licenses.gpl3Only;
|
||||||
agpl3Only
|
maintainers = with maintainers; [
|
||||||
gpl3Only
|
GaetanLepage
|
||||||
|
niklaskorz
|
||||||
];
|
];
|
||||||
maintainers = with maintainers; [ ];
|
|
||||||
mainProgram = "zed";
|
mainProgram = "zed";
|
||||||
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue