Merge pull request #185169 from extole/kafka_3

This commit is contained in:
Sandro 2022-10-25 16:45:08 +02:00 committed by GitHub
commit 9237fad409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 12 deletions

View File

@ -74,6 +74,10 @@ let
}) { inherit system; });
in with pkgs; {
kafka_2_7 = makeKafkaTest "kafka_2_7" apacheKafka_2_7;
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;
}

View File

@ -1,22 +1,39 @@
{ lib, stdenv, fetchurl, jdk8_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
majorVersion ? "1.0" }:
let
jre8 = jdk8_headless;
jre11 = jdk11_headless;
versionMap = {
"2.7" = {
kafkaVersion = "2.7.1";
"3.3" = {
kafkaVersion = "3.3.1";
scalaVersion = "2.13";
sha256 = "1qv6blf99211bc80xnd4k42r9v9c5vilyqkplyhsa6hqymg32gfa";
jre = jre11;
sha256 = "sha256-GK2KNl+xEd4knTu4vzyWzRrwYOyPs+PR/Ep64Q2QQt4=";
jre = jdk17_headless;
};
"3.2" = {
kafkaVersion = "3.2.3";
scalaVersion = "2.13";
sha256 = "sha256-tvkbwBP83M1zl31J4g6uu4/LEhqJoIA9Eam48fyT24A=";
jre = jdk17_headless;
};
"3.1" = {
kafkaVersion = "3.1.2";
scalaVersion = "2.13";
sha256 = "sha256-SO1bTQkG3YQSv657QjwBeBCWbDlDqS3E5eUp7ciojnI=";
jre = jdk17_headless;
};
"3.0" = {
kafkaVersion = "3.0.2";
scalaVersion = "2.13";
sha256 = "sha256-G8b6STGlwow+iDqMCeZkF3HTKd94TKccmyfZ7AT/7yE=";
jre = jdk17_headless;
};
"2.8" = {
kafkaVersion = "2.8.2";
scalaVersion = "2.13";
sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ=";
jre = jre11;
jre = jdk11_headless;
};
};
in
@ -66,5 +83,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.ragge ];
platforms = platforms.unix;
};
passthru = { inherit jre; };
passthru = { inherit jdk17_headless; };
}

View File

@ -16091,9 +16091,12 @@ with pkgs;
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;
apacheKafka = apacheKafka_2_8;
apacheKafka_2_7 = callPackage ../servers/apache-kafka { majorVersion = "2.7"; };
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 {};