diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-31 00:02:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-31 00:02:07 +0000 |
commit | ba060bffac5ada1bd2be64b6061c6e69ac3bc9aa (patch) | |
tree | 3dd5f3a839ae21a7a1aa587a67e7e00622da7c32 /pkgs/applications/editors | |
parent | fe34b95595aa74401ae0cdc0135c6e4b72b3862a (diff) | |
parent | 4a660d5bb29c955bc776d59f88693a0d7772f3ad (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/helix/default.nix | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 323218f9437bf..698b4f8a1b16d 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,29 +1,18 @@ -{ fetchpatch, fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: +{ fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "23.10"; + version = "24.03"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { 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; }; - patches = [ - # 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="; + cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE="; nativeBuildInputs = [ git installShellFiles makeWrapper ]; |