From 6d77de48e2c1f4090ec0c6e03ef0d1410039dfda Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 16 Aug 2024 14:09:11 -0700
Subject: [PATCH] apacheKafka: remove with statements

---
 pkgs/servers/apache-kafka/default.nix | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 815905f76edb..b69a9d62d81c 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -18,17 +18,17 @@ let
     };
   };
 
-  build = versionInfo: with versionInfo; stdenv.mkDerivation rec {
-    version = "${scalaVersion}-${kafkaVersion}";
+  build = versionInfo: stdenv.mkDerivation rec {
+    version = "${versionInfo.scalaVersion}-${versionInfo.kafkaVersion}";
     pname = "apache-kafka";
 
     src = fetchurl {
-      url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz";
-      inherit sha256;
+      url = "mirror://apache/kafka/${versionInfo.kafkaVersion}/kafka_${version}.tgz";
+      inherit (versionInfo) sha256;
     };
 
     nativeBuildInputs = [ makeWrapper ];
-    buildInputs = [ jre bash gnugrep gnused coreutils ps ];
+    buildInputs = [ versionInfo.jre bash gnugrep gnused coreutils ps ];
 
     installPhase = ''
       mkdir -p $out
@@ -47,7 +47,7 @@ let
 
       for p in $out/bin\/*.sh; do
         wrapProgram $p \
-          --set JAVA_HOME "${jre}" \
+          --set JAVA_HOME "${versionInfo.jre}" \
           --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \
           --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin"
       done
@@ -55,19 +55,19 @@ let
     '';
 
     passthru = {
-      inherit jre; # Used by the NixOS module to select the supported jre
+      inherit (versionInfo) jre; # Used by the NixOS module to select the supported JRE
       tests.nixos = versionInfo.nixosTest;
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://kafka.apache.org";
       description = "High-throughput distributed messaging system";
-      license = licenses.asl20;
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      maintainers = [ maintainers.ragge ];
-      platforms = platforms.unix;
+      license = lib.licenses.asl20;
+      sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+      maintainers = [ lib.maintainers.ragge ];
+      platforms = lib.platforms.unix;
     };
   };
-in with lib; mapAttrs'
-  (majorVersion: versionInfo: nameValuePair "apacheKafka_${majorVersion}" (build versionInfo))
+in lib.mapAttrs'
+  (majorVersion: versionInfo: lib.nameValuePair "apacheKafka_${majorVersion}" (build versionInfo))
   versionMap