Unverified Commit 12cb3164 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #184933 from kira-bruneau/cmake-language-server 

cmake-language-server: 0.1.4 → 0.1.5
parents ae899d6e 3c98399b

pkgs/development/tools/cmake-language-server/default.nix→pkgs/development/tools/misc/cmake-language-server/default.nix

+23 −6
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, buildPythonApplication

, fetchFromGitHub

, poetry

, cmake-format

, pygls

, pyparsing

, cmake
@@ -11,19 +12,22 @@ 


buildPythonApplication rec {

  pname = "cmake-language-server";

  version = "0.1.4";

  version = "0.1.5";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "regen100";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-FOyyXSgoFpX4mOHFyZtVW618M1Xs7k+IioJzm1sdkKY=";

    rev = "refs/tags/v${version}";

    sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ=";

  };



  patches = [

    # Test timeouts occasionally cause the build to fail

    ./disable-test-timeouts.patch



    # cmake-language-server depends on pygls 0.11, but still works with 0.12

    ./use-latest-pygls.patch

  ];



  postPatch = ''
@@ -31,10 +35,23 @@ buildPythonApplication rec { 
      --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"'

  '';



  nativeBuildInputs = [ poetry ];

  propagatedBuildInputs = [ pygls pyparsing ];

  nativeBuildInputs = [

    poetry

  ];



  propagatedBuildInputs = [

    cmake-format

    pygls

    pyparsing

  ];



  checkInputs = [

    cmake

    cmake-format

    pytest-datadir

    pytestCheckHook

  ];



  checkInputs = [ cmake pytest-datadir pytestCheckHook ];

  dontUseCmakeConfigure = true;

  pythonImportsCheck = [ "cmake_language_server" ];

pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch→pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch

+13 −0
Original line number Diff line number Diff line 
diff --git a/tests/test_server.py b/tests/test_server.py

index c0777f5..1184fb3 100644

index 2d09bb2..59a122a 100644

--- a/tests/test_server.py

+++ b/tests/test_server.py

@@ -11,7 +11,7 @@ from pygls.types import (CompletionContext, CompletionParams,

                          InitializeParams, Position, TextDocumentIdentifier,

                          TextDocumentItem, TextDocumentPositionParams)

@@ -26,7 +26,7 @@ from pygls.lsp.types import (

 )

 from pygls.server import LanguageServer

 

-CALL_TIMEOUT = 2

+CALL_TIMEOUT = None

 

 

 def _init(client: LanguageServer, root: Path):
 
 def _init(client: LanguageServer, root: Path) -> None:

pkgs/development/tools/misc/cmake-language-server/use-latest-pygls.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/pyproject.toml b/pyproject.toml

index 417df1d..0f59857 100644

--- a/pyproject.toml

+++ b/pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [

 

 [tool.poetry.dependencies]

 python = "^3.6"

-pygls = "^0.11"

+pygls = "^0.12"

 importlib-metadata = {version = "^4.8", python = "<3.8"}

 

 [tool.poetry.dev-dependencies]

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -15689,8 +15689,8 @@ with pkgs; 














  cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };



























  cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server {













    inherit cmake;













  cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server {













    inherit cmake cmake-format;















  };





























  # Does not actually depend on Qt 5