diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/python-language-server/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/python-language-server/default.nix | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix index 4558bc7edba4..f22652d0f73c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27 +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson +, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -21,33 +21,33 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.34.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU="; + sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; }; - patches = [ - # https://github.com/palantir/python-language-server/pull/851 - (fetchpatch { - url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch"; - sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5"; - }) - ]; + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] + ++ lib.optional (withProvider "autopep8") autopep8 + ++ lib.optional (withProvider "mccabe") mccabe + ++ lib.optional (withProvider "pycodestyle") pycodestyle + ++ lib.optional (withProvider "pydocstyle") pydocstyle + ++ lib.optional (withProvider "pyflakes") pyflakes + ++ lib.optional (withProvider "pylint") pylint + ++ lib.optional (withProvider "rope") rope + ++ lib.optional (withProvider "yapf") yapf + ++ lib.optional isPy27 configparser + ++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - postPatch = '' - # https://github.com/palantir/python-jsonrpc-server/issues/36 - sed -i -e 's!ujson<=!ujson>=!' setup.py - ''; # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytestcov coverage flaky # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope @@ -67,21 +67,10 @@ buildPythonPackage rec { "test_matplotlib_completions" "test_snippet_parsing" "test_numpy_hover" - ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; - - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] - ++ stdenv.lib.optional (withProvider "autopep8") autopep8 - ++ stdenv.lib.optional (withProvider "mccabe") mccabe - ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle - ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle - ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes - ++ stdenv.lib.optional (withProvider "pylint") pylint - ++ stdenv.lib.optional (withProvider "rope") rope - ++ stdenv.lib.optional (withProvider "yapf") yapf - ++ stdenv.lib.optional isPy27 configparser - ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; + "test_symbols" + ] ++ lib.optional isPy27 "test_flake8_lint"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; |