From c09a0a837a75b91a580587d15c6f9e8fcfada834 Mon Sep 17 00:00:00 2001
From: Erik Skytthe <ers@dbc.dk>
Date: Fri, 30 Jun 2023 15:08:03 +0200
Subject: [PATCH] apacheKafka: 3.5.0, 3.4.1, 3.3.1 -> 3.3.2

---
 nixos/tests/kafka.nix                 |  2 ++
 pkgs/servers/apache-kafka/default.nix | 18 +++++++++++++++---
 pkgs/top-level/all-packages.nix       |  4 +++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 79af02710c3..864253fd8c7 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -72,5 +72,7 @@ in with pkgs; {
   kafka_3_1  = makeKafkaTest "kafka_3_1"  apacheKafka_3_1;
   kafka_3_2  = makeKafkaTest "kafka_3_2"  apacheKafka_3_2;
   kafka_3_3  = makeKafkaTest "kafka_3_3"  apacheKafka_3_3;
+  kafka_3_4  = makeKafkaTest "kafka_3_4"  apacheKafka_3_4;
+  kafka_3_5  = makeKafkaTest "kafka_3_5"  apacheKafka_3_5;
   kafka  = makeKafkaTest "kafka"  apacheKafka;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index cb3691460bd..114a0ce96f0 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -3,10 +3,22 @@
 
 let
   versionMap = {
-    "3.3" = {
-      kafkaVersion = "3.3.1";
+    "3.5" = {
+      kafkaVersion = "3.5.0";
       scalaVersion = "2.13";
-      sha256 = "sha256-GK2KNl+xEd4knTu4vzyWzRrwYOyPs+PR/Ep64Q2QQt4=";
+      sha256 = "sha256-KjpGjgab5XDxbWEqgZbC96kge36shlvpNNIM4SUusvg=";
+      jre = jdk17_headless;
+    };
+    "3.4" = {
+      kafkaVersion = "3.4.1";
+      scalaVersion = "2.13";
+      sha256 = "sha256-p28XpSuPLNMd4RVx/zZqcUggtuTgKJOwFZ0J2w7a+Zg=";
+      jre = jdk17_headless;
+    };
+    "3.3" = {
+      kafkaVersion = "3.3.2";
+      scalaVersion = "2.13";
+      sha256 = "sha256-Gv5XrpXnEajH8fSbcfIfURz+QPcqTrJ1oe3SGXYLNRc=";
       jre = jdk17_headless;
     };
     "3.2" = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41438b17e46..ded8cdc81a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18014,12 +18014,14 @@ with pkgs;
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_3_3;
+  apacheKafka = apacheKafka_3_5;
   apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; };
   apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; };
   apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; };
   apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; };
   apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; };
+  apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; };
+  apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; };
 
   kt = callPackage ../tools/misc/kt { };