rabbitmq-server: 3.6.10 -> 3.7.8

- New dependency on 'getconf' binary for
  3aa619e9ef/src/vm_memory_monitor.erl (L448)
- New dependency on 'socat' for systemd notifications
  4a3ee3a336/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
This commit is contained in:
Alexey Lebedeff 2018-09-24 15:30:32 +02:00 committed by Profpatsch
parent ded8f28c3a
commit a6ff5865d1
3 changed files with 18 additions and 28 deletions

View file

@ -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>

View file

@ -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/;

View file

@ -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 { };