From b0f33d7c2e170a3a4c55b40dc61e50873ad1036c Mon Sep 17 00:00:00 2001
From: Manuel Bärenz <programming@manuelbaerenz.de>
Date: Mon, 2 Aug 2021 15:23:07 +0200
Subject: rabbitmq-server: 3.8.9 -> 3.9.1

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index c2d13b00aa8..f7ee83e7208 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
 
-  version = "3.8.9";
+  version = "3.9.1";
 
   # 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";
-    sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
+    sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a13a470668..1ac7522d769 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20265,8 +20265,6 @@ in
 
   rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
-    elixir = beam_nox.interpreters.elixir_1_8;
-    erlang = beam_nox.interpreters.erlangR23;
   };
 
   radicale1 = callPackage ../servers/radicale/1.x.nix { };
-- 
cgit 1.4.1


From 4d5c2bc76e650b6fb5f58cc6c45d4aea093b2a79 Mon Sep 17 00:00:00 2001
From: Manuel Bärenz <programming@manuelbaerenz.de>
Date: Mon, 2 Aug 2021 18:19:53 +0200
Subject: rabbitmq-server: Apply nixpkgs-review hints

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index f7ee83e7208..3f2e595b31f 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
     sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
   };
 
-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
   buildInputs =
-    [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
+    [ erlang elixir python libxml2 libxslt glibcLocales ]
     ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
 
   outputs = [ "out" "man" "doc" ];
@@ -40,13 +40,6 @@ stdenv.mkDerivation rec {
     # rabbitmq-env calls to sed/coreutils, so provide everything early
     sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
 
-    # rabbitmq-server script uses `dirname` to get hold of a
-    # rabbitmq-env, so let's provide this file directly. After that
-    # point everything is OK - the PATH above will kick in
-    substituteInPlace $out/sbin/rabbitmq-server \
-      --replace '`dirname $0`/rabbitmq-env' \
-                "$out/sbin/rabbitmq-env"
-
     # We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
     # By doing it early we make sure that auto-detection for this will
     # never be executed (somewhere below in the script).
-- 
cgit 1.4.1