diff --git a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch index a83e208c1716..14201b96b061 100644 --- a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch +++ b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch @@ -1,4 +1,4 @@ -From 17cec4d94bc04bd02b91361ca72f561f1eebce60 Mon Sep 17 00:00:00 2001 +From 14bdb9c39cfd813697a4f5d83ed2b4c4c043a309 Mon Sep 17 00:00:00 2001 From: V Date: Tue, 9 Apr 2024 06:15:00 +0200 Subject: [PATCH] Hardcode perl @@ -8,7 +8,7 @@ Subject: [PATCH] Hardcode perl 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/rc/lsp.kak b/rc/lsp.kak -index b173478..015c3ca 100644 +index 306b405..6662d29 100644 --- a/rc/lsp.kak +++ b/rc/lsp.kak @@ -280,12 +280,8 @@ define-command -hidden lsp-menu -params 1.. %{ @@ -16,7 +16,7 @@ index b173478..015c3ca 100644 define-command -hidden lsp-menu-impl %{ evaluate-commands %sh{ - if ! command -v perl > /dev/null; then -- printf "fail %{'perl' must be installed to use the 'lsp-menu' command}" +- echo "lsp-show-error %{'perl' must be installed to use the 'lsp-menu' command}" - exit - fi echo >$kak_command_fifo "echo -to-file $kak_response_fifo -quoting kakoune -- %reg{a}" @@ -25,9 +25,9 @@ index b173478..015c3ca 100644 use strict; my $Q = "'\''"; my @args = (); -@@ -2410,11 +2406,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm +@@ -2467,11 +2463,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm }} - + define-command lsp-snippets-insert -hidden -params 1 %[ - evaluate-commands %sh{ - if ! command -v perl > /dev/null; then @@ -37,7 +37,7 @@ index b173478..015c3ca 100644 evaluate-commands -draft -save-regs '^"' %[ set-register '"' %arg{1} execute-keys -@@ -2469,7 +2460,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ +@@ -2526,7 +2517,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ define-command -hidden lsp-snippets-insert-perl-impl %[ set-register x nop evaluate-commands %sh[ # $kak_quoted_selections @@ -46,6 +46,6 @@ index b173478..015c3ca 100644 use strict; use warnings; use Text::ParseWords(); --- -2.44.0 +-- +2.45.2 diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 1135fa3430a7..2a2d7a83a175 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -12,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "kakoune-lsp"; - version = "17.0.1"; + version = "17.1.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "kakoune-lsp"; + repo = "kakoune-lsp"; rev = "v${version}"; - sha256 = "sha256-uXKquAjfytUn/Q0kx+0BGRQTkVMQ9rMRnTCy622upag="; + sha256 = "sha256-XBH2pMDiHJNXrx90Lt0IcsbMFUM+X7GAHgiHpdlIdR4="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-XnhYODMzqInwbgM8wveY048sljZ8OKw4hLYJG5h8Twc="; + cargoHash = "sha256-Yi+T+9E3Wvce4kDLsRgZ07RAGLrq7dkinKpvvGeLeS0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices