From 6c6dd0e32b6419ed1bc1c938185c41fe13149b66 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sun, 3 Jul 2022 15:31:49 +0200
Subject: [PATCH 1/2] python3Packages.classify-imports: init at 4.1.0

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 .../classify-imports/default.nix              | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/classify-imports/default.nix

diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix
new file mode 100644
index 000000000000..3e0245ab58d1
--- /dev/null
+++ b/pkgs/development/python-modules/classify-imports/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "classify-imports";
+  version = "4.1.0";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "asottile";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI=";
+  };
+
+  pythonImportsCheck = [
+    "classify_imports"
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Utilities for refactoring imports in python-like syntax";
+    homepage = "https://github.com/asottile/classify-imports";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gador ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7c6532b67c3..7d8978e03933 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1706,6 +1706,8 @@ in {
 
   claripy = callPackage ../development/python-modules/claripy { };
 
+  classify-imports = callPackage ../development/python-modules/classify-imports { };
+
   cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };
 
   cle = callPackage ../development/python-modules/cle { };

From 8ccaffe21a33506bf3d7ca817cdd57ed101bf036 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sun, 3 Jul 2022 15:34:02 +0200
Subject: [PATCH 2/2] python3Packages.reorder-python-imports: 3.1.0 -> 3.8.1

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 .../python-modules/reorder-python-imports/default.nix  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix
index 1bb3475168c1..795a3168c82f 100644
--- a/pkgs/development/python-modules/reorder-python-imports/default.nix
+++ b/pkgs/development/python-modules/reorder-python-imports/default.nix
@@ -4,21 +4,25 @@
 , pytestCheckHook
 , pythonOlder
 , aspy-refactor-imports
+, classify-imports
 }:
 
 buildPythonPackage rec {
   pname = "reorder-python-imports";
-  version = "3.1.0";
+  version = "3.8.1";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "reorder_python_imports";
     rev = "v${version}";
-    hash = "sha256-Ge+VQjK24TqWLMQS19DBX+FFHF3irogK21orlENJx50=";
+    hash = "sha256-CLC9dfNSYqEBZB2fP34jpA/4cxm0HZzjo/e7Yn8XPFc=";
   };
 
-  propagatedBuildInputs = [ aspy-refactor-imports ];
+  propagatedBuildInputs = [
+    aspy-refactor-imports
+    classify-imports
+  ];
 
   pythonImportsCheck = [
     "reorder_python_imports"