From 7770fb82b9037d4a20a47f7e2046adaf76485f9f Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 27 Oct 2024 03:27:39 +0100
Subject: [PATCH 1/2] =?UTF-8?q?rabbitmq-server:=203.13.7=20=E2=86=92=204.0?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set myself as maintainer since there is none.
---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index f741858b011a..b7c47f1d4b76 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -23,6 +23,7 @@
 , Carbon
 , Cocoa
 , nixosTests
+, which
 }:
 
 let
@@ -38,15 +39,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
-  version = "3.13.7";
+  version = "4.0.2";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-GDUyYudwhQSLrFXO21W3fwmH2tl2STF9gSuZsb3GZh0=";
+    hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE=";
   };
 
-  nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];
+  nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 which ];
 
   buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ];
@@ -91,6 +92,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ samueltardieu ];
   };
 }

From 52cef79ecf9ba806a62626aab0904fa5018f5179 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 28 Oct 2024 12:16:57 +0100
Subject: [PATCH 2/2] rabbitmq-server: reformat

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 109 +++++++++++-------
 1 file changed, 70 insertions(+), 39 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index b7c47f1d4b76..383ab5af129f 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,40 +1,44 @@
-{ lib
-, stdenv
-, fetchurl
-, erlang
-, elixir
-, python3
-, libxml2
-, libxslt
-, xmlto
-, docbook_xml_dtd_45
-, docbook_xsl
-, zip
-, unzip
-, rsync
-, getconf
-, socat
-, procps
-, coreutils
-, gnused
-, systemd
-, glibcLocales
-, AppKit
-, Carbon
-, Cocoa
-, nixosTests
-, which
+{
+  lib,
+  stdenv,
+  fetchurl,
+  erlang,
+  elixir,
+  python3,
+  libxml2,
+  libxslt,
+  xmlto,
+  docbook_xml_dtd_45,
+  docbook_xsl,
+  zip,
+  unzip,
+  rsync,
+  getconf,
+  socat,
+  procps,
+  coreutils,
+  gnused,
+  systemd,
+  glibcLocales,
+  AppKit,
+  Carbon,
+  Cocoa,
+  nixosTests,
+  which,
 }:
 
 let
-  runtimePath = lib.makeBinPath ([
-    erlang
-    getconf # for getting memory limits
-    socat
-    procps
-    gnused
-    coreutils # used by helper scripts
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]); # for systemd unit activation check
+  runtimePath = lib.makeBinPath (
+    [
+      erlang
+      getconf # for getting memory limits
+      socat
+      procps
+      gnused
+      coreutils # used by helper scripts
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]
+  ); # for systemd unit activation check
 in
 
 stdenv.mkDerivation rec {
@@ -47,19 +51,46 @@ stdenv.mkDerivation rec {
     hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE=";
   };
 
-  nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 which ];
+  nativeBuildInputs = [
+    unzip
+    xmlto
+    docbook_xml_dtd_45
+    docbook_xsl
+    zip
+    rsync
+    python3
+    which
+  ];
 
-  buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ];
+  buildInputs =
+    [
+      erlang
+      elixir
+      libxml2
+      libxslt
+      glibcLocales
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      AppKit
+      Carbon
+      Cocoa
+    ];
 
-  outputs = [ "out" "man" "doc" ];
+  outputs = [
+    "out"
+    "man"
+    "doc"
+  ];
 
   installFlags = [
     "PREFIX=${placeholder "out"}"
     "RMQ_ERLAPP_DIR=${placeholder "out"}"
   ];
 
-  installTargets = [ "install" "install-man" ];
+  installTargets = [
+    "install"
+    "install-man"
+  ];
 
   preBuild = ''
     export LANG=C.UTF-8 # fix elixir locale warning