From 5b2ff695449519ed6bb31736d8a48ab132f6a0d9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 6 Aug 2018 20:41:52 +0200 Subject: python-language-server: add providers option Adding all of the extra dependencies isn't always desirable and overriding a bunch of inputs is a bit cumbersome and brittle. eg. python-language-server.override { providers = ["rope"]; } --- .../python-language-server/default.nix | 41 +++++++++++++++------- 1 file changed, 28 insertions(+), 13 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index a25424f7f220..800c9eba2abb 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,18 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , configparser, futures, future, jedi, pluggy , pytest, mock, pytestcov, coverage -# The following packages are optional and -# can be overwritten with null as your liking. -# This also requires to disable tests. -, rope ? null +, # Allow building a limited set of providers, e.g. ["pycodestyle"]. + providers ? ["*"] + # The following packages are optional and + # can be overwritten with null as your liking. +, autopep8 ? null , mccabe ? null -, pyflakes ? null , pycodestyle ? null -, autopep8 ? null -, yapf ? null , pydocstyle ? null +, pyflakes ? null +, rope ? null +, yapf ? null }: +let + withProvider = p: builtins.elem "*" providers || builtins.elem p providers; +in + buildPythonPackage rec { pname = "python-language-server"; version = "0.19.0"; @@ -24,22 +29,32 @@ buildPythonPackage rec { sha256 = "0glnhnjmsnnh1vs73n9dglknfkhcgp03nkjbpz0phh1jlqrkrwm6"; }; + # The tests require all the providers, disable otherwise. + doCheck = providers == ["*"]; + checkInputs = [ pytest mock pytestcov coverage # rope is technically a dependency, but we don't add it by default since we # already have jedi, which is the preferred option rope ]; + checkPhase = '' HOME=$TEMPDIR pytest ''; - propagatedBuildInputs = [ - jedi pluggy mccabe pyflakes pycodestyle yapf pydocstyle future autopep8 - ] ++ lib.optional (isPy27) [ configparser ] - ++ lib.optional (pythonOlder "3.2") [ futures ]; + propagatedBuildInputs = [ jedi pluggy future ] + ++ 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 "rope") rope + ++ stdenv.lib.optional (withProvider "yapf") yapf + ++ stdenv.lib.optional isPy27 configparser + ++ stdenv.lib.optional (pythonOlder "3.2") futures; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://github.com/palantir/python-language-server; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; -- cgit 1.4.1