summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2020-09-21 15:42:26 +0200
committerGitHub <noreply@github.com>2020-09-21 15:42:26 +0200
commit44289eb20cd000507de63b86dd2c1a79aa5a0745 (patch)
tree613a21f48e49447ef32dd0a3b277b283a234326c
parentd4eed01376d33dc06571c256e96fcca9c3907c44 (diff)
parent8850a2c906782b6d45e9953d7e96f5ac41094208 (diff)
Merge pull request #91170 from DianaOlympos/update/apache-kafka
apache-kafka: 2.4.0 -> 2.4.1/2.5.0
-rw-r--r--nixos/tests/kafka.nix1
-rw-r--r--pkgs/servers/apache-kafka/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix3
3 files changed, 10 insertions, 3 deletions
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index d29c802b47b4..88e30b62baa2 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -90,4 +90,5 @@ in with pkgs; {
kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3;
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
+ kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
}
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 337e6c2a875c..6daf3251102b 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -49,9 +49,14 @@ let
sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas";
};
"2.4" = {
- kafkaVersion = "2.4.0";
+ kafkaVersion = "2.4.1";
scalaVersion = "2.12";
- sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r";
+ sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1";
+ };
+ "2.5" = {
+ kafkaVersion = "2.5.0";
+ scalaVersion = "2.13";
+ sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi";
};
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 025fbab5a67a..86a06d852b67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10522,7 +10522,7 @@ in
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
- apacheKafka = apacheKafka_2_4;
+ apacheKafka = apacheKafka_2_5;
apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
@@ -10533,6 +10533,7 @@ in
apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; };
apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; };
apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
+ apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };
kt = callPackage ../tools/misc/kt {};