From efda027ada18b933c1119f82232c8409fe106865 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Sat, 5 Jun 2021 15:18:25 +0800
Subject: [PATCH 1/3] python3Packages.pyls-black: 0.4.6 -> 0.4.7

Remove patch included in upstream release.
---
 .../python-modules/pyls-black/default.nix         | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix
index 7c8652b0a5e3..a0419d5d03f2 100644
--- a/pkgs/development/python-modules/pyls-black/default.nix
+++ b/pkgs/development/python-modules/pyls-black/default.nix
@@ -1,27 +1,18 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub
 , black, toml, pytest, python-language-server, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "pyls-black";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "rupert";
     repo = "pyls-black";
     rev = "v${version}";
-    sha256 = "0cjf0mjn156qp0x6md6mncs31hdpzfim769c2lixaczhyzwywqnj";
+    sha256 = "0bkhfnlik89j3yamr20br4wm8975f20v33wabi2nyxvj10whr5dj";
   };
 
-  # Fix test failure with black 21.4b0+
-  # Remove if https://github.com/rupert/pyls-black/pull/39 merged.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/rupert/pyls-black/commit/728207b540d9c25eb0d1cd96419ebfda2e257f63.patch";
-      sha256 = "0i3w5myhjl5lq1lpkizagnmk6m8fkn3igfyv5f2qcrn5n7f119ak";
-    })
-  ];
-
   disabled = !isPy3k;
 
   checkPhase = ''

From 7f48484135060f2a8822da9023a94b286ba6056e Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Sat, 5 Jun 2021 15:57:44 +0800
Subject: [PATCH 2/3] python3Packages.pyls-black: use pytestCheckHook

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

diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix
index a0419d5d03f2..b72d789ccfdd 100644
--- a/pkgs/development/python-modules/pyls-black/default.nix
+++ b/pkgs/development/python-modules/pyls-black/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub
-, black, toml, pytest, python-language-server, isPy3k
+, black, toml, pytestCheckHook, python-language-server, isPy3k
 }:
 
 buildPythonPackage rec {
@@ -15,11 +15,7 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  checkPhase = ''
-    pytest
-  '';
-
-  checkInputs = [ pytest ];
+  checkInputs = [ pytestCheckHook ];
 
   propagatedBuildInputs = [ black toml python-language-server ];
 

From 9f33e6417b60631130b158c67ecf577848aff24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 5 Jun 2021 09:59:46 +0200
Subject: [PATCH 3/3] pyls-black: reformat with nixpkgs-fmt

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

diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix
index b72d789ccfdd..d10e4930ac0c 100644
--- a/pkgs/development/python-modules/pyls-black/default.nix
+++ b/pkgs/development/python-modules/pyls-black/default.nix
@@ -1,5 +1,11 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, black, toml, pytestCheckHook, python-language-server, isPy3k
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, black
+, toml
+, pytestCheckHook
+, python-language-server
+, isPy3k
 }:
 
 buildPythonPackage rec {