From 8231febc5d5094e9efa3c32e875ddbc8aa5759e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 Aug 2022 18:19:03 -0700 Subject: [PATCH 1/3] Apache Kafka upgrade to 3.x --- nixos/tests/kafka.nix | 4 +++- pkgs/servers/apache-kafka/default.nix | 25 +++++++++++++++++++------ 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 5def759ca24d..8be5c61b48b0 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 4b674de61faa..13c6330c42d2 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 cac7c2df88f2..477621b7cd47 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 {}; From e55474ecc3e594de41f7696e8b537ffff5353e81 Mon Sep 17 00:00:00 2001 From: Benjamin Smith Date: Fri, 14 Oct 2022 12:52:05 -0700 Subject: [PATCH 2/3] 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 {}; From fcf5df8aadb4763bad6286eb8cb016c4b171ab47 Mon Sep 17 00:00:00 2001 From: Benjamin Smith Date: Fri, 14 Oct 2022 13:10:22 -0700 Subject: [PATCH 3/3] update hashes for new versions --- pkgs/servers/apache-kafka/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 6078f89794fc..bf51260c7fe1 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -6,25 +6,25 @@ let "3.3" = { kafkaVersion = "3.3.1"; scalaVersion = "2.13"; - sha256 = "440fe73d73ebb78ee0d7accbfd69f53e2281544cf18ea6672c85ef4f6734170b"; + sha256 = "sha256-GK2KNl+xEd4knTu4vzyWzRrwYOyPs+PR/Ep64Q2QQt4="; jre = jdk17_headless; }; "3.2" = { kafkaVersion = "3.2.3"; scalaVersion = "2.13"; - sha256 = "440fe73d73ebb78ee0d7accbfd69f53e2281544cf18ea6672c85ef4f6734170b"; + sha256 = "sha256-tvkbwBP83M1zl31J4g6uu4/LEhqJoIA9Eam48fyT24A="; jre = jdk17_headless; }; "3.1" = { kafkaVersion = "3.1.2"; scalaVersion = "2.13"; - sha256 = "e91e50b0aaa499795a51d984a9d00953f9a2781c51314f47ae4df8b2db1a6c9a"; + sha256 = "sha256-SO1bTQkG3YQSv657QjwBeBCWbDlDqS3E5eUp7ciojnI="; jre = jdk17_headless; }; "3.0" = { kafkaVersion = "3.0.2"; scalaVersion = "2.13"; - sha256 = "1a95abe81dc18eafee65f5bc440ff21ba0c49bd2c6d36bf7878ee8a2e2536097"; + sha256 = "sha256-G8b6STGlwow+iDqMCeZkF3HTKd94TKccmyfZ7AT/7yE="; jre = jdk17_headless; }; "2.8" = {