summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-09-12 09:07:42 +0100
committerGitHub <noreply@github.com>2018-09-12 09:07:42 +0100
commit1696eb4c52c0a8ef9382234411d9e1a251c8e262 (patch)
treed766d74c8407e0c5bb1fdb09c159ee8935b729ff /pkgs/development
parent591631f417fd15f12fc153793b04a9d9dcd11fe9 (diff)
parent63668d33b208790ce91e0ec53e263dd18bb5aba4 (diff)
downloadnixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.tar
nixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.tar.gz
nixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.tar.bz2
nixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.tar.lz
nixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.tar.xz
nixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.tar.zst
nixlib-1696eb4c52c0a8ef9382234411d9e1a251c8e262.zip
Merge pull request #46563 from Mic92/pyls
python-language-server: 0.19.0 -> 0.21.2
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/python-jsonrpc-server/default.nix34
-rw-r--r--pkgs/development/python-modules/python-language-server/default.nix8
2 files changed, 38 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
new file mode 100644
index 000000000000..508f18e6da00
--- /dev/null
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+, pytest, mock, pytestcov, coverage
+, future, futures
+}:
+
+buildPythonPackage rec {
+  pname = "python-jsonrpc-server";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "palantir";
+    repo = "python-jsonrpc-server";
+    rev = version;
+    sha256 = "0p5dj1hxx3yz8vjk59dcp3h6ci1hrjkbzf9lr3vviy0xw327409k";
+  };
+
+  checkInputs = [
+    pytest mock pytestcov coverage
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  propagatedBuildInputs = [ future ]
+    ++ stdenv.lib.optional (pythonOlder "3.2") futures;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/palantir/python-jsonrpc-server;
+    description = "A Python 2 and 3 asynchronous JSON RPC server";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 800c9eba2abb..56c00fa11a9f 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
-, configparser, futures, future, jedi, pluggy
+, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
 , pytest, mock, pytestcov, coverage
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]
@@ -20,13 +20,13 @@ in
 
 buildPythonPackage rec {
   pname = "python-language-server";
-  version = "0.19.0";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-language-server";
     rev = version;
-    sha256 = "0glnhnjmsnnh1vs73n9dglknfkhcgp03nkjbpz0phh1jlqrkrwm6";
+    sha256 = "11fvrpv1kymj2fzh8fhys4qk1xc64j1rbdrz252awyab7b3509i7";
   };
 
   # The tests require all the providers, disable otherwise.
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     HOME=$TEMPDIR pytest
   '';
 
-  propagatedBuildInputs = [ jedi pluggy future ]
+  propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
     ++ stdenv.lib.optional (withProvider "autopep8") autopep8
     ++ stdenv.lib.optional (withProvider "mccabe") mccabe
     ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle