From 3ea430ca2a17873d718d612b79031b6c6a4f6e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Aug 2018 14:11:34 +0200
Subject: [PATCH 1/3] python.pkgs.pyls-black: init at 0.2.1

---
 .../python-modules/pyls-black/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pyls-black/default.nix

diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix
new file mode 100644
index 000000000000..b19fad1a1f19
--- /dev/null
+++ b/pkgs/development/python-modules/pyls-black/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, black, toml, pytest, python-language-server, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "pyls-black";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "rupert";
+    repo = "pyls-black";
+    rev = "v${version}";
+    sha256 = "0xa3iv8nhnj0lw0dh41qb0dqp55sb6rdxalbk60v8jll6qyc0si8";
+  };
+
+  disabled = !isPy3k;
+
+  checkPhase = ''
+    pytest
+  '';
+
+  checkInputs = [ pytest ];
+
+  propagatedBuildInputs = [ black toml python-language-server ];
+
+  meta = with lib; {
+    homepage = https://github.com/rupert/pyls-black;
+    description = "Black plugin for the Python Language Server";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6fc3a140eb81..26c1215ae019 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11003,10 +11003,12 @@ in {
 
   python-language-server = callPackage ../development/python-modules/python-language-server {};
 
-  pyls-mypy = callPackage ../development/python-modules/pyls-mypy {};
+  pyls-black = callPackage ../development/python-modules/pyls-black {};
 
   pyls-isort = callPackage ../development/python-modules/pyls-isort {};
 
+  pyls-mypy = callPackage ../development/python-modules/pyls-mypy {};
+
   pyudev = callPackage ../development/python-modules/pyudev {
     inherit (pkgs) systemd;
   };

From 0165572217ea432cd717eefdd60599401b1518d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Aug 2018 14:22:59 +0200
Subject: [PATCH 2/3] python3.pkgs.pyls-mypy: 0.1.2 -> 0.1.3

---
 .../python-modules/pyls-mypy/default.nix       | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix
index 985d1937d3fb..dfba421ae58d 100644
--- a/pkgs/development/python-modules/pyls-mypy/default.nix
+++ b/pkgs/development/python-modules/pyls-mypy/default.nix
@@ -1,29 +1,21 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub
 , future, python-language-server, mypy, configparser
 , pytest, mock, isPy3k, pytestcov, coverage
 }:
 
 buildPythonPackage rec {
   pname = "pyls-mypy";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "tomv564";
     repo = "pyls-mypy";
     rev = version;
-    sha256 = "0wa038a8a8yj3wmrc7q909nj4b5d3lq70ysbw7rpsnyb0x06m826";
+    sha256 = "0v7ghcd1715lxlfq304b7xhchp31ahdd89lf6za4n0l59dz74swh";
   };
 
   disabled = !isPy3k;
 
-  patches = [
-    # also part of https://github.com/tomv564/pyls-mypy/pull/10
-    (fetchpatch {
-      url = "https://github.com/Mic92/pyls-mypy/commit/4c727120d2cbd8bf2825e1491cd55175f03266d2.patch";
-      sha256 = "1dgn5z742swpxwknmgvm65jpxq9zwzhggw4nl6ys7yw8r49kqgrl";
-    })
-  ];
-
   checkPhase = ''
     HOME=$TEMPDIR pytest
   '';
@@ -35,8 +27,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = https://github.com/palantir/python-language-server;
-    description = "An implementation of the Language Server Protocol for Python";
+    homepage = https://github.com/tomv564/pyls-mypy;
+    description = "Mypy plugin for the Python Language Server";
     license = licenses.mit;
     maintainers = [ maintainers.mic92 ];
   };

From c260a4d001d1f0f5b20a6e180b06c89132261feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Aug 2018 14:28:01 +0200
Subject: [PATCH 3/3] python.pkgs.pyls-isort: fix url/description

---
 pkgs/development/python-modules/pyls-isort/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix
index fce7999a7569..fa94441e2003 100644
--- a/pkgs/development/python-modules/pyls-isort/default.nix
+++ b/pkgs/development/python-modules/pyls-isort/default.nix
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = https://github.com/palantir/python-language-server;
-    description = "An implementation of the Language Server Protocol for Python";
+    homepage = https://github.com/paradoxxxzero/pyls-isort;
+    description = "Isort plugin for python-language-server";
     license = licenses.mit;
     maintainers = [ maintainers.mic92 ];
   };