From a6ff5865d1342cdc6d04c1de005a5648432dbe33 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Mon, 24 Sep 2018 15:30:32 +0200
Subject: [PATCH] rabbitmq-server: 3.6.10 -> 3.7.8

- New dependency on 'getconf' binary for
  https://github.com/rabbitmq/rabbitmq-common/blob/3aa619e9ef81cfe6db0c776e6cd829ce234a7881/src/vm_memory_monitor.erl#L448
- New dependency on 'socat' for systemd notifications
  https://github.com/rabbitmq/rabbitmq-server/blob/4a3ee3a336bc82f2e56ec5d2292c80458ccc2974/src/rabbit.erl#L361
- elixir_1_6 for a new 'rabbitmqctl' tool
- Replace patching with providing custom PATH, as we already have some
  other things here
- Renamed package in all-packages.nix from a legacy spelling
---
 nixos/doc/manual/release-notes/rl-1903.xml    |  5 +++
 pkgs/servers/amqp/rabbitmq-server/default.nix | 37 +++++--------------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 8c8237e6371..3e7f8d0681d 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -99,6 +99,11 @@
      </listitem>
     </itemizedlist>
    </listitem>
+   <listitem>
+     <para>
+       Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 22a9aef8eda..514771f7e58 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,41 +1,30 @@
-{ stdenv, fetchurl
-, erlang, python, libxml2, libxslt, xmlto
-, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
+{ stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto
+, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
 , AppKit, Carbon, Cocoa
-, getconf
 }:
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
-  version = "3.6.15";
+
+  version = "3.7.8";
 
   src = fetchurl {
-    url = "https://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.xz";
-    sha256 = "1zdmil657mhjmd20jv47s5dfpj2liqwvyg0zv2ky3akanfpgj98y";
+    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "00jsix333g44y20psrp12c96b7d161yvrysnygjjz4wc5gbrzlxy";
   };
 
   buildInputs =
-    [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
+    [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
 
   outputs = [ "out" "man" "doc" ];
 
-  postPatch = with stdenv.lib; ''
-    # patch the path to getconf
-    substituteInPlace deps/rabbit_common/src/vm_memory_monitor.erl \
-      --replace "getconf PAGESIZE" "${getconf}/bin/getconf PAGESIZE"
-  '';
-
-  preBuild = ''
-    # Fix the "/usr/bin/env" in "calculate-relative".
-    patchShebangs .
-  '';
-
   installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)";
   installTargets = "install install-man";
 
+  runtimePath = stdenv.lib.makeBinPath [getconf erlang socat];
   postInstall = ''
-    echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
+    echo 'PATH=${runtimePath}:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
 
     # we know exactly where rabbitmq is gonna be,
     # so we patch that into the env-script
@@ -49,13 +38,7 @@ stdenv.mkDerivation rec {
 
     # and an unecessarily copied INSTALL file
     rm $out/INSTALL
-
-    # patched into a source file above;
-    # needs to be explicitely passed to not be stripped by fixup
-    mkdir -p $out/nix-support
-    echo "${getconf}" > $out/nix-support/dont-strip-getconf
-
-    '';
+  '';
 
   meta = {
     homepage = http://www.rabbitmq.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0510c11b19..ae61bafd360 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13483,8 +13483,10 @@ with pkgs;
 
   quagga = callPackage ../servers/quagga { };
 
-  rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server {
+  rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
+    elixir = elixir_1_6;
+    erlang = erlang_nox;
   };
 
   radicale1 = callPackage ../servers/radicale/1.x.nix { };