nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262458 from kira-bruneau/emacsPackages.lsp-bridge

Browse Source 
emacsPackages.lsp-bridge: 20230607.135 -> 20231021.309
This commit is contained in:
Lin Jian 2023-10-22 17:20:35 +08:00 committed by GitHub
commit ed02e10e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
View File

@ -5,7 +5,6 @@
, substituteAll
, acm
, markdown-mode
, posframe
, git
, go
, gopls
@ -17,23 +16,25 @@
}:
let
rev = "6f93deb32ebb3799dfedd896a17a0428a9b461bb";
rev = "0b30d95c6de95b150d93ecee325b95e04ff09e46";
python = python3.withPackages (ps: with ps; [
epc
orjson
paramiko
rapidfuzz
sexpdata
six
]);
in
melpaBuild {
pname = "lsp-bridge";
version = "20230607.135"; # 1:35 UTC
version = "20231021.309"; # 3:09 UTC
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
hash = "sha256-4AKKsU+yuLA9qv6mhYPpjBJ8wrbGPMuzN98JXcVPAHg=";
hash = "sha256-hR7bZh0ElJ8F9ToJ4dkazF19T8PE01MTcxKrjeaEp4o=";
};
commit = rev;
@ -50,7 +51,6 @@ melpaBuild {
packageRequires = [
acm
markdown-mode
posframe
];
checkInputs = [

22
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch
View File

@ -1,18 +1,24 @@
diff --git a/lsp-bridge.el b/lsp-bridge.el
index 3a7ff0b..ea5e496 100644
index 278c27e..f0c67c2 100644
--- a/lsp-bridge.el
+++ b/lsp-bridge.el
@@ -326,13 +326,7 @@ Setting this to nil or 0 will turn off the indicator."
@@ -340,19 +340,7 @@ Setting this to nil or 0 will turn off the indicator."
"Name of LSP-Bridge buffer."
:type 'string)
-(defcustom lsp-bridge-python-command (cond ((memq system-type '(cygwin windows-nt ms-dos))
- (if (executable-find "pypy3.exe")
- "pypy3.exe"
- "python3.exe"))
- (t (if (executable-find "pypy3")
- "pypy3"
- "python3")))
- (cond ((executable-find "pypy3.exe")
- "pypy3.exe")
- ((executable-find "python3.exe")
- "python3.exe")
- ((executable-find "python.exe")
- "python.exe")))
- (t (cond ((executable-find "pypy3")
- "pypy3")
- ((executable-find "python3")
- "python3")
- ((executable-find "python")
- "python"))))
+(defcustom lsp-bridge-python-command "@python@"
"The Python interpreter used to run lsp_bridge.py."
:type 'string)