From a260b9a4846ae894281dbc98308bb7576f50d183 Mon Sep 17 00:00:00 2001
From: Matt Huszagh <huszaghmatt@gmail.com>
Date: Sat, 26 Oct 2019 12:59:05 -0700
Subject: [PATCH 1/2] pythonPackages.jedi: 0.14.1 -> 0.15.1
---
pkgs/development/python-modules/jedi/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index ae3594939056..2340d5142b5b 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jedi";
- version = "0.14.1";
+ version = "0.15.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0dmgx9c0f7yx897bf13nrp5gbgal192y44y5dhqcvkyklzqm1j2k";
+ sha256 = "0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds";
};
postPatch = ''
From b754310a688ffb1a2e224ef18910cf4c762cd8e5 Mon Sep 17 00:00:00 2001
From: Matt Huszagh <huszaghmatt@gmail.com>
Date: Sat, 26 Oct 2019 12:59:39 -0700
Subject: [PATCH 2/2] pythonPackages.python-language-server: 0.28.3 -> 0.29.1
Fixes a failing test due to a pylint update.
---
.../python-modules/python-language-server/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 4bf482b9ae49..b029373bdca7 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
-, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
+, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
, pytest, mock, pytestcov, coverage, setuptools
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
@@ -21,13 +21,13 @@ in
buildPythonPackage rec {
pname = "python-language-server";
- version = "0.28.3";
+ version = "0.29.1";
src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
- sha256 = "16d8i43r75h0cijggkkmmpnycn29wlbjp63mgg3s4nbrxfa96x2k";
+ sha256 = "0hsp0h8vma8z6f0mg311hp59h6hayl7zzxmy295x5fl2l9iiakfv";
};
# The tests require all the providers, disable otherwise.
@@ -44,7 +44,7 @@ buildPythonPackage rec {
HOME=$TEMPDIR pytest
'';
- propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ]
+ propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle