pyrox.dev
Merge pull request #262458 from kira-bruneau/emacsPackages.lsp-bridge
emacsPackages.lsp-bridge: 20230607.135 -> 20231021.309
+5
-5
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+5
-5
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
···
5
5
, substituteAll
6
6
, acm
7
7
, markdown-mode
8
-
, posframe
9
8
, git
10
9
, go
11
10
, gopls
···
17
16
}:
18
17
19
18
let
20
-
rev = "6f93deb32ebb3799dfedd896a17a0428a9b461bb";
19
+
rev = "0b30d95c6de95b150d93ecee325b95e04ff09e46";
21
20
python = python3.withPackages (ps: with ps; [
22
21
epc
23
22
orjson
23
+
paramiko
24
+
rapidfuzz
24
25
sexpdata
25
26
six
26
27
]);
27
28
in
28
29
melpaBuild {
29
30
pname = "lsp-bridge";
30
-
version = "20230607.135"; # 1:35 UTC
31
+
version = "20231021.309"; # 3:09 UTC
31
32
32
33
src = fetchFromGitHub {
33
34
owner = "manateelazycat";
34
35
repo = "lsp-bridge";
35
36
inherit rev;
36
-
hash = "sha256-4AKKsU+yuLA9qv6mhYPpjBJ8wrbGPMuzN98JXcVPAHg=";
37
+
hash = "sha256-hR7bZh0ElJ8F9ToJ4dkazF19T8PE01MTcxKrjeaEp4o=";
37
38
};
38
39
39
40
commit = rev;
···
50
51
packageRequires = [
51
52
acm
52
53
markdown-mode
53
-
posframe
54
54
];
55
55
56
56
checkInputs = [
+14
-8
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch
+14
-8
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch
···
1
1
diff --git a/lsp-bridge.el b/lsp-bridge.el
2
-
index 3a7ff0b..ea5e496 100644
2
+
index 278c27e..f0c67c2 100644
3
3
--- a/lsp-bridge.el
4
4
+++ b/lsp-bridge.el
5
-
@@ -326,13 +326,7 @@ Setting this to nil or 0 will turn off the indicator."
5
+
@@ -340,19 +340,7 @@ Setting this to nil or 0 will turn off the indicator."
6
6
"Name of LSP-Bridge buffer."
7
7
:type 'string)
8
8
9
9
-(defcustom lsp-bridge-python-command (cond ((memq system-type '(cygwin windows-nt ms-dos))
10
-
- (if (executable-find "pypy3.exe")
11
-
- "pypy3.exe"
12
-
- "python3.exe"))
13
-
- (t (if (executable-find "pypy3")
14
-
- "pypy3"
15
-
- "python3")))
10
+
- (cond ((executable-find "pypy3.exe")
11
+
- "pypy3.exe")
12
+
- ((executable-find "python3.exe")
13
+
- "python3.exe")
14
+
- ((executable-find "python.exe")
15
+
- "python.exe")))
16
+
- (t (cond ((executable-find "pypy3")
17
+
- "pypy3")
18
+
- ((executable-find "python3")
19
+
- "python3")
20
+
- ((executable-find "python")
21
+
- "python"))))
16
22
+(defcustom lsp-bridge-python-command "@python@"
17
23
"The Python interpreter used to run lsp_bridge.py."
18
24
:type 'string)