Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 32 insertions, 15 deletions

diff --git a/nixpkgs/pkgs/servers/confluent-platform/default.nix b/nixpkgs/pkgs/servers/confluent-platform/default.nix
index aa01d3157167..3f77c88b19c3 100644
--- a/nixpkgs/pkgs/servers/confluent-platform/default.nix
+++ b/nixpkgs/pkgs/servers/confluent-platform/default.nix
@@ -1,19 +1,34 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub
-, jre, makeWrapper, bash, gnused }:
-
-stdenv.mkDerivation rec {
+{
+  bash
+, fetchurl
+, gnused
+, jre
+, lib
+, makeBinaryWrapper
+, stdenv
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "confluent-platform";
-  version = "7.3.0";
+  version = "7.4.1";
 
   src = fetchurl {
-    url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz";
-    sha256 = "sha256-j120gSIky0CHNgzaVnodMAniecRX0RpU6+il86nxdrQ=";
+    url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz";
+    hash = "sha256-dJwG+QRplXX7etxG/e1kzcRMJppF6TYofio8FO1p+aI=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ jre bash ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    bash
+    jre
+  ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out
     cp -R bin etc share src $out
     rm -rf $out/bin/windows
@@ -33,13 +48,15 @@ stdenv.mkDerivation rec {
         --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \
         --prefix PATH : "${jre}/bin:${bash}/bin:${gnused}/bin"
     done
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
-    homepage = "https://www.confluent.io/";
+  meta = {
     description = "Confluent event streaming platform based on Apache Kafka";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ zoedsoupe ];
-    platforms = platforms.unix;
+    homepage = "https://www.confluent.io/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ zoedsoupe ];
+    platforms = lib.platforms.unix;
   };
-}
+})