-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #302761 from deviant/kakoune-lsp-17.0.1
kakoune-lsp: 16.0.0 -> 17.0.1
- Loading branch information
Showing
3 changed files
with
86 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
From 14bdb9c39cfd813697a4f5d83ed2b4c4c043a309 Mon Sep 17 00:00:00 2001 | ||
From: V <v@anomalous.eu> | ||
Date: Tue, 9 Apr 2024 06:15:00 +0200 | ||
Subject: [PATCH] Hardcode perl | ||
|
||
--- | ||
rc/lsp.kak | 13 ++----------- | ||
1 file changed, 2 insertions(+), 11 deletions(-) | ||
|
||
diff --git a/rc/lsp.kak b/rc/lsp.kak | ||
index 306b405..6662d29 100644 | ||
--- a/rc/lsp.kak | ||
+++ b/rc/lsp.kak | ||
@@ -280,12 +280,8 @@ define-command -hidden lsp-menu -params 1.. %{ | ||
} | ||
define-command -hidden lsp-menu-impl %{ | ||
evaluate-commands %sh{ | ||
- if ! command -v perl > /dev/null; then | ||
- 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}" | ||
- perl < $kak_response_fifo -we ' | ||
+ @perl@/bin/perl < $kak_response_fifo -we ' | ||
use strict; | ||
my $Q = "'\''"; | ||
my @args = (); | ||
@@ -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 | ||
- printf "fail %{'perl' must be installed to use the 'lsp-snippets-insert' command'}" | ||
- fi | ||
- } | ||
evaluate-commands -draft -save-regs '^"' %[ | ||
set-register '"' %arg{1} | ||
execute-keys <a-P> | ||
@@ -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 | ||
- perl -e ' | ||
+ @perl@/bin/perl -e ' | ||
use strict; | ||
use warnings; | ||
use Text::ParseWords(); | ||
-- | ||
2.45.2 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,52 @@ | ||
{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }: | ||
{ | ||
lib, | ||
rustPlatform, | ||
fetchFromGitHub, | ||
replaceVars, | ||
perl, | ||
stdenv, | ||
CoreServices, | ||
Security, | ||
SystemConfiguration, | ||
}: | ||
|
||
rustPlatform.buildRustPackage rec { | ||
pname = "kakoune-lsp"; | ||
version = "16.0.0"; | ||
version = "17.1.1"; | ||
|
||
src = fetchFromGitHub { | ||
owner = pname; | ||
repo = pname; | ||
owner = "kakoune-lsp"; | ||
repo = "kakoune-lsp"; | ||
rev = "v${version}"; | ||
sha256 = "sha256-d4Tc6iYp20uOKMd+T2LhWgXWZzvzq1E+VWqjhhiIiHE="; | ||
sha256 = "sha256-XBH2pMDiHJNXrx90Lt0IcsbMFUM+X7GAHgiHpdlIdR4="; | ||
}; | ||
|
||
cargoHash = "sha256-kV8d0PwIWS6gyfCtv70iv8MrL91ZOZbwYznhc3lUw0U="; | ||
patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; | ||
|
||
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; | ||
cargoHash = "sha256-Yi+T+9E3Wvce4kDLsRgZ07RAGLrq7dkinKpvvGeLeS0="; | ||
|
||
patches = [ | ||
./Use-full-Perl-path.patch | ||
buildInputs = lib.optionals stdenv.isDarwin [ | ||
CoreServices | ||
Security | ||
SystemConfiguration | ||
]; | ||
|
||
postPatch = '' | ||
substituteInPlace rc/lsp.kak \ | ||
--subst-var-by perlPath ${lib.getBin perl} | ||
''; | ||
|
||
meta = with lib; { | ||
meta = { | ||
description = "Kakoune Language Server Protocol Client"; | ||
homepage = "https://github.com/kakoune-lsp/kakoune-lsp"; | ||
license = with licenses; [ unlicense /* or */ mit ]; | ||
maintainers = with maintainers; [ philiptaron spacekookie poweredbypie ]; | ||
|
||
# See https://github.com/kakoune-lsp/kakoune-lsp/commit/55dfc83409b9b7d3556bacda8ef8b71fc33b58cd | ||
license = with lib.licenses; [ | ||
unlicense | ||
mit | ||
]; | ||
|
||
maintainers = with lib.maintainers; [ | ||
philiptaron | ||
spacekookie | ||
poweredbypie | ||
]; | ||
|
||
mainProgram = "kak-lsp"; | ||
}; | ||
} |