diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-01-09 23:14:49 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-01-11 12:10:51 +0100 |
| commit | eea84e25e62d35ec0a3577900a0055b9849e53fc (patch) | |
| tree | 7e638bbcf0d00c65c45f3568bcd1718cac30bced /pkgs/development/python-modules/python-language-server | |
| parent | aa3a78911af9645d5a292c3de568823b72edf39d (diff) | |
pythonPackages.notmuch2: Disable tests
Diffstat (limited to 'pkgs/development/python-modules/python-language-server')
| -rw-r--r-- | pkgs/development/python-modules/python-language-server/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 85e55634806a..dc3b33a6f539 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,8 +1,4 @@ -<<<<<<< HEAD -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27 -======= -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 ->>>>>>> 15db9043242... pythonPackages.python-language-server: 0.34.1 -> 0.36.2 +{ 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, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. |