diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index 0f01045a6f14..cbddeafd2365 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -29,6 +29,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Requires network access
     "test_server_with_path"
+    # AssertionError: 'reader type: null not compatible with writer type: int'
+    "test_schema_compatibility_type_mismatch"
   ];
 
   pythonImportsCheck = [
@@ -38,6 +40,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python serialization and RPC framework";
     homepage = "https://github.com/apache/avro";
+    changelog = "https://github.com/apache/avro/releases/tag/release-${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ zimbatm ];
   };
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 17f33d8b7fc9..03cdb826786c 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,22 +1,73 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }:
+{ lib
+, avro
+, buildPythonPackage
+, fastavro
+, fetchFromGitHub
+, jsonschema
+, protobuf
+, pyflakes
+, pyrsistent
+, pytestCheckHook
+, pythonOlder
+, rdkafka
+, requests
+, requests-mock
+}:
 
 buildPythonPackage rec {
-  version = "2.0.2";
   pname = "confluent-kafka";
+  version = "2.1.1";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-OzQupCJu0QXKi8A1sId+TcLxFf/adOOjUPNjaDNWUVs=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "confluentinc";
+    repo = "confluent-kafka-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xnbovQRvbhaYYXnssV0Jy+U9L6BUddIagbup2jdTugY=";
   };
 
-  buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;
+  buildInputs = [
+    rdkafka
+  ];
 
-  # No tests in PyPi Tarball
-  doCheck = false;
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  passthru.optional-dependencies = {
+    avro = [
+      avro
+      fastavro
+    ];
+    json = [
+      jsonschema
+      pyrsistent
+    ];
+    protobuf = [
+      protobuf
+    ];
+  };
+
+  nativeCheckInputs = [
+    pyflakes
+    pytestCheckHook
+    requests-mock
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  pythonImportsCheck = [
+    "confluent_kafka"
+  ];
+
+  disabledTestPaths = [
+    "tests/integration/"
+  ];
 
   meta = with lib; {
     description = "Confluent's Apache Kafka client for Python";
     homepage = "https://github.com/confluentinc/confluent-kafka-python";
+    changelog = "https://github.com/confluentinc/confluent-kafka-python/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ mlieberman85 ];
   };