diff options
| author | github-actions <github-actions@github.com> | 2022-08-04 18:19:03 -0700 |
|---|---|---|
| committer | Benjamin Smith <polynomial@gmail.com> | 2022-10-14 12:47:06 -0700 |
| commit | 8231febc5d5094e9efa3c32e875ddbc8aa5759e6 (patch) | |
| tree | e6f8a6fa42d45dc234d226111207a2892aa7d14c | |
| parent | 7d682ef84f2cf07f53fac2adacf8a1388d3337c4 (diff) | |
| download | nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.tar nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.tar.gz nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.tar.bz2 nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.tar.lz nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.tar.xz nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.tar.zst nixpkgs-8231febc5d5094e9efa3c32e875ddbc8aa5759e6.zip | |
Apache Kafka upgrade to 3.x
| -rw-r--r-- | nixos/tests/kafka.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/apache-kafka/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 26 insertions, 9 deletions
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 5def759ca24..8be5c61b48b 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -74,6 +74,8 @@ 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 = makeKafkaTest "kafka" apacheKafka; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 4b674de61fa..13c6330c42d 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,15 +1,27 @@ -{ 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; + jre = jdk17_headless; versionMap = { - "2.7" = { - kafkaVersion = "2.7.1"; + "3.2" = { + kafkaVersion = "3.2.1"; scalaVersion = "2.13"; - sha256 = "1qv6blf99211bc80xnd4k42r9v9c5vilyqkplyhsa6hqymg32gfa"; - jre = jre11; + sha256 = "440fe73d73ebb78ee0d7accbfd69f53e2281544cf18ea6672c85ef4f6734170b"; + jre = jre; + }; + "3.1" = { + kafkaVersion = "3.1.1"; + scalaVersion = "2.13"; + sha256 = "e91e50b0aaa499795a51d984a9d00953f9a2781c51314f47ae4df8b2db1a6c9a"; + jre = jre; + }; + "3.0" = { + kafkaVersion = "3.0.1"; + scalaVersion = "2.13"; + sha256 = "1a95abe81dc18eafee65f5bc440ff21ba0c49bd2c6d36bf7878ee8a2e2536097"; + jre = jre; }; "2.8" = { kafkaVersion = "2.8.2"; @@ -17,6 +29,7 @@ let sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ="; jre = jre11; }; + }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac7c2df88f..477621b7cd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16010,9 +16010,11 @@ 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_2; 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"; }; kt = callPackage ../tools/misc/kt {}; |