From 45c4b6b9e4ca221fd3d16008ae9cf1133725f824 Mon Sep 17 00:00:00 2001 From: Benjamin Smith Date: Thu, 5 Aug 2021 04:01:59 -0700 Subject: [PATCH] Apache Kafka: add 2.7.1 and 2.8.0 (#128043) --- nixos/tests/kafka.nix | 5 ++--- pkgs/servers/apache-kafka/default.nix | 24 +++++++++--------------- pkgs/top-level/aliases.nix | 9 --------- pkgs/top-level/all-packages.nix | 7 +++---- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 034601c815b..95711808a2c 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -75,7 +75,6 @@ let }) { inherit system; }); in with pkgs; { - kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; - kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; - kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6; + kafka_2_7 = makeKafkaTest "kafka_2_7" apacheKafka_2_7; + kafka_2_8 = makeKafkaTest "kafka_2_8" apacheKafka_2_8; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 935db27044f..4fec4390e34 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -5,22 +5,16 @@ let jre8 = jdk8_headless; jre11 = jdk11_headless; versionMap = { - "2.4" = { - kafkaVersion = "2.4.1"; - scalaVersion = "2.12"; - sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1"; - jre = jre8; - }; - "2.5" = { - kafkaVersion = "2.5.1"; - scalaVersion = "2.12"; - sha256 = "1wn4iszrm2rvsfyyr515zx79k5m86davjkcwcwpxcgc4k3q0z7lv"; - jre = jre8; - }; - "2.6" = { - kafkaVersion = "2.6.1"; + "2.7" = { + kafkaVersion = "2.7.1"; scalaVersion = "2.13"; - sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y"; + sha256 = "1qv6blf99211bc80xnd4k42r9v9c5vilyqkplyhsa6hqymg32gfa"; + jre = jre11; + }; + "2.8" = { + kafkaVersion = "2.8.0"; + scalaVersion = "2.13"; + sha256 = "1iljfjlp29m4s6gkja9fxkzj8a8p0qc0sfy8x4g1318kbnp818rz"; jre = jre11; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1bdadffbc60..06f0ff4d558 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -53,15 +53,6 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 - apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 - apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3cca0379df..b75524099d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13128,10 +13128,9 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_6; - apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; - apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; - apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; }; + apacheKafka = apacheKafka_2_8; + apacheKafka_2_7 = callPackage ../servers/apache-kafka { majorVersion = "2.7"; }; + apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; kt = callPackage ../tools/misc/kt {};