From 45c1cd7888f253b1dfe4d707c682df8161f1d40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 19 Jul 2024 00:21:06 -0700
Subject: [PATCH 1/2] python312Packages.aiokafka: refactor

Diff: https://github.com/aio-libs/aiokafka/compare/refs/tags/v0.10.0...v0.11.0

Changelog: https://github.com/aio-libs/aiokafka/releases/tag/v0.11.0
---
 .../python-modules/aiokafka/default.nix       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix
index 6044c069609b..c44bf8e44468 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/pkgs/development/python-modules/aiokafka/default.nix
@@ -2,17 +2,15 @@
   lib,
   async-timeout,
   buildPythonPackage,
+  cramjam,
   cython,
   fetchFromGitHub,
   gssapi,
-  kafka-python,
-  lz4,
   packaging,
-  python-snappy,
   pythonOlder,
   setuptools,
+  typing-extensions,
   zlib,
-  zstandard,
 }:
 
 buildPythonPackage rec {
@@ -20,7 +18,7 @@ buildPythonPackage rec {
   version = "0.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "aio-libs";
@@ -38,15 +36,19 @@ buildPythonPackage rec {
 
   dependencies = [
     async-timeout
-    kafka-python
     packaging
+    typing-extensions
   ];
 
   optional-dependencies = {
-    snappy = [ python-snappy ];
-    lz4 = [ lz4 ];
-    zstd = [ zstandard ];
+    snappy = [ cramjam ];
+    lz4 = [ cramjam ];
+    zstd = [ cramjam ];
     gssapi = [ gssapi ];
+    all = [
+      cramjam
+      gssapi
+    ];
   };
 
   # Checks require running Kafka server

From 8ad810aa5d432cf9e5e3dfb51dd129f0e07ecdfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 19 Jul 2024 00:26:26 -0700
Subject: [PATCH 2/2] python312Packages.kafka-python: drop

The only users aiokafka and parsedmarc stopped depending on it.
---
 .../python-modules/kafka-python/default.nix   | 41 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/kafka-python/default.nix

diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
deleted file mode 100644
index 67e7febd7f17..000000000000
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  pytest,
-  six,
-  mock,
-}:
-
-buildPythonPackage rec {
-  version = "2.0.2";
-  format = "setuptools";
-  pname = "kafka-python";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "04dfe7fea2b63726cd6f3e79a2d86e709d608d74406638c5da33a01d45a9d7e3";
-  };
-
-  nativeCheckInputs = [
-    pytest
-    six
-    mock
-  ];
-
-  checkPhase = ''
-    py.test
-  '';
-
-  # Upstream uses tox but we don't on Nix. Running tests manually produces however
-  #     from . import unittest
-  # E   ImportError: cannot import name 'unittest'
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Pure Python client for Apache Kafka";
-    homepage = "https://github.com/dpkp/kafka-python";
-    license = licenses.asl20;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 721f2409520a..2deac32df67c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -283,6 +283,7 @@ mapAliases ({
   jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18
   jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11
   jupyterlab_server = jupyterlab-server; # added 2023-11-12
+  kafka-python = kafka-python-ng; # added 2024-07-19
   Kajiki = kajiki; # added 2023-02-19
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b67720f4067..f1f4c4d015f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6612,8 +6612,6 @@ self: super: with self; {
 
   kaa-metadata = callPackage ../development/python-modules/kaa-metadata { };
 
-  kafka-python = callPackage ../development/python-modules/kafka-python { };
-
   kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { };
 
   kaggle = callPackage ../development/python-modules/kaggle { };