Merge pull request #300251 from acuteenvy/helix-v24.03

helix: 23.10 -> 24.03
This commit is contained in:
zowoq 2024-03-31 08:35:18 +10:00 committed by GitHub
commit 5b81448bdd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,29 +1,18 @@
{ fetchpatch, fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: { fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "helix"; pname = "helix";
version = "23.10"; version = "24.03";
# This release tarball includes source code for the tree-sitter grammars, # This release tarball includes source code for the tree-sitter grammars,
# which is not ordinarily part of the repository. # which is not ordinarily part of the repository.
src = fetchzip { src = fetchzip {
url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
hash = "sha256-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA="; hash = "sha256-1myVGFBwdLguZDPo1jrth/q2i5rn5R2+BVKIkCCUalc=";
stripRoot = false; stripRoot = false;
}; };
patches = [ cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE=";
# Fixes implicit int error in rescript grammar when building with clang 16.
# https://github.com/nkrkv/tree-sitter-rescript/pull/227.
(fetchpatch {
url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch";
hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o=";
extraPrefix = "runtime/grammars/sources/rescript/";
stripLen = 1;
})
];
cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs=";
nativeBuildInputs = [ git installShellFiles makeWrapper ]; nativeBuildInputs = [ git installShellFiles makeWrapper ];