From 01a85ce48b156973cb0aa9f5a898a6975d20b1cf Mon Sep 17 00:00:00 2001
From: Souvik Sen <senso@deshaw.com>
Date: Wed, 6 Oct 2021 23:14:34 -0400
Subject: [PATCH] kcat(previously kafkacat): 1.6.0 -> 1.7.0

Fixed the 1.7.0 build and renamed the package per upstream.
(https://github.com/edenhill/kcat/commit/3fc21aa1e9facc5fa546b9c922fc26a41666a0c1)
---
 .../tools/{kafkacat => kcat}/default.nix           | 14 +++++++-------
 pkgs/top-level/aliases.nix                         |  1 +
 pkgs/top-level/all-packages.nix                    |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename pkgs/development/tools/{kafkacat => kcat}/default.nix (67%)

diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kcat/default.nix
similarity index 67%
rename from pkgs/development/tools/kafkacat/default.nix
rename to pkgs/development/tools/kcat/default.nix
index 5493bf24428d..d4cc4a37ea1a 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kcat/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes, which }:
 
 stdenv.mkDerivation rec {
-  pname = "kafkacat";
+  pname = "kcat";
 
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "edenhill";
-    repo = "kafkacat";
+    repo = "kcat";
     rev = version;
-    sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs";
+    sha256 = "sha256-koDhj/RQc9fhfqjrJylhURw6tppPELhLlBGbNVJsii8=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config which ];
 
   buildInputs = [ zlib rdkafka yajl avro-c libserdes ];
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A generic non-JVM producer and consumer for Apache Kafka";
-    homepage = "https://github.com/edenhill/kafkacat";
+    homepage = "https://github.com/edenhill/kcat";
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ nyarly ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de1f397d89bd..710d08ce2293 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -373,6 +373,7 @@ mapAliases ({
   jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
+  kafkacat = kcat; # added 2021-10-07
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
   k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
   kodiGBM = kodi-gbm;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c9fb71ab805..7b09e6bb7543 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14434,10 +14434,10 @@ with pkgs;
 
   k2tf = callPackage ../development/tools/misc/k2tf { };
 
-  kafkacat = callPackage ../development/tools/kafkacat { };
-
   kati = callPackage ../development/tools/build-managers/kati { };
 
+  kcat = callPackage ../development/tools/kcat { };
+
   kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
 
   kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {