From e55474ecc3e594de41f7696e8b537ffff5353e81 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Fri, 14 Oct 2022 12:52:05 -0700
Subject: [PATCH] requested review changes, and kafka 3.3

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

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 8be5c61b48b0..c0488a0e93a3 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -77,5 +77,7 @@ in with pkgs; {
   kafka_2_8  = makeKafkaTest "kafka_2_8"  apacheKafka_2_8;
   kafka_3_0  = makeKafkaTest "kafka_3_0"  apacheKafka_3_0;
   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  = makeKafkaTest "kafka"  apacheKafka;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 13c6330c42d2..6078f89794fc 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -2,32 +2,36 @@
   majorVersion ? "1.0" }:
 
 let
-  jre11 = jdk11_headless;
-  jre   = jdk17_headless;
   versionMap = {
-    "3.2" = {
-      kafkaVersion = "3.2.1";
+    "3.3" = {
+      kafkaVersion = "3.3.1";
       scalaVersion = "2.13";
       sha256 = "440fe73d73ebb78ee0d7accbfd69f53e2281544cf18ea6672c85ef4f6734170b";
-      jre = jre;
+      jre = jdk17_headless;
+    };
+    "3.2" = {
+      kafkaVersion = "3.2.3";
+      scalaVersion = "2.13";
+      sha256 = "440fe73d73ebb78ee0d7accbfd69f53e2281544cf18ea6672c85ef4f6734170b";
+      jre = jdk17_headless;
     };
     "3.1" = {
-      kafkaVersion = "3.1.1";
+      kafkaVersion = "3.1.2";
       scalaVersion = "2.13";
       sha256 = "e91e50b0aaa499795a51d984a9d00953f9a2781c51314f47ae4df8b2db1a6c9a";
-      jre = jre;
+      jre = jdk17_headless;
     };
     "3.0" = {
-      kafkaVersion = "3.0.1";
+      kafkaVersion = "3.0.2";
       scalaVersion = "2.13";
       sha256 = "1a95abe81dc18eafee65f5bc440ff21ba0c49bd2c6d36bf7878ee8a2e2536097";
-      jre = jre;
+      jre = jdk17_headless;
     };
     "2.8" = {
       kafkaVersion = "2.8.2";
       scalaVersion = "2.13";
       sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ=";
-      jre = jre11;
+      jre = jdk11_headless;
     };
 
   };
@@ -79,5 +83,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.ragge ];
     platforms = platforms.unix;
   };
-  passthru = { inherit jre; };
+  passthru = { inherit jdk17_headless; };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 477621b7cd47..5227d6bc678b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16010,11 +16010,12 @@ with pkgs;
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_3_2;
+  apacheKafka = apacheKafka_3_3;
   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"; };
 
   kt = callPackage ../tools/misc/kt {};