Unverified Commit 8820dd8b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

lsp-bridge: 20230603.345 -> 20230607.135
parents f7fe2e5f 3f9a4f84

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

+14 −12
Original line number Diff line number Diff line
@@ -10,13 +10,14 @@ 
, go

, gopls

, pyright

, ruff

, tempel

, writeText

, unstableGitUpdater

}:



let

  rev = "8de85f9967fec6a8e447e5b5f3021e5e1f95b445";

  rev = "6f93deb32ebb3799dfedd896a17a0428a9b461bb";

  python = python3.withPackages (ps: with ps; [

    epc

    orjson
@@ -26,24 +27,25 @@ let 
in

melpaBuild {

  pname = "lsp-bridge";

  version = "20230603.345"; # 3:45 UTC

  version = "20230607.135"; # 1:35 UTC



  src = fetchFromGitHub {

    owner = "manateelazycat";

    repo = "lsp-bridge";

    inherit rev;

    sha256 = "sha256-08DFgZaYdlz9f9eqZuG760vpmO3D4QN9V66YqVyVsV4=";

    hash = "sha256-4AKKsU+yuLA9qv6mhYPpjBJ8wrbGPMuzN98JXcVPAHg=";

  };



  commit = rev;



  patches = [

    # Hardcode the python dependencies needed for lsp-bridge, so users

    # don't have to modify their global environment

  postPatch = ''

    substituteInPlace lsp-bridge.el --replace \

     '(defcustom lsp-bridge-python-command (if (memq system-type '"'"'(cygwin windows-nt ms-dos)) "python.exe" "python3")' \

     '(defcustom lsp-bridge-python-command "${python.interpreter}"'

  '';

    (substituteAll {

      src = ./hardcode-dependencies.patch;

      python = python.interpreter;

    })

  ];



  packageRequires = [

    acm
@@ -51,13 +53,13 @@ melpaBuild { 
    posframe

  ];



  buildInputs = [ python ];



  checkInputs = [

    git

    go

    gopls

    pyright

    python

    ruff

    tempel

  ];

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
diff --git a/lsp-bridge.el b/lsp-bridge.el

index 3a7ff0b..ea5e496 100644

--- a/lsp-bridge.el

+++ b/lsp-bridge.el

@@ -326,13 +326,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")))

+(defcustom lsp-bridge-python-command "@python@"

   "The Python interpreter used to run lsp_bridge.py."

   :type 'string)