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 8dc857e4a985..99f66c938e32 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -378,6 +378,7 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 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 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d4365937d87..437eeec58cfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14715,10 +14715,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 {