diff options
| author | Antoine Eiche <lewo@abesis.fr> | 2017-02-09 00:12:49 +0100 |
|---|---|---|
| committer | Antoine Eiche <lewo@abesis.fr> | 2017-02-09 00:12:49 +0100 |
| commit | b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756 (patch) | |
| tree | e818da354831ac4606e92cdcb6369565450fa404 | |
| parent | 554bfea26f4cc39b4ed1b09459fc8ad49bc81c65 (diff) | |
| download | nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.tar nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.tar.gz nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.tar.bz2 nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.tar.lz nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.tar.xz nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.tar.zst nixlib-b2e7b4b0d7f29b08ec334b460bcaae9bb85d7756.zip | |
rabbitmq: 3.5.8 -> 3.6.6
Fix CVE-2015-8786.
| -rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 62814b351b6b..f96f3cc2d14f 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto -, docbook_xml_dtd_45, docbook_xsl, zip, unzip +, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa }: @@ -7,15 +7,15 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.5.8"; + version = "3.6.6"; src = fetchurl { - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_8/rabbitmq-server-3.5.8.tar.gz"; - sha256 = "0f373zxz15smb0jvfdfsbb924fl2qmp1z2jy3y50gv6b3xsdyqmr"; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_6/rabbitmq-server-3.6.6.tar.xz"; + sha256 = "13mpnyfxd026w525rsnkcw0f8bcrkbzl7k9g8pnqmm3zyny8jmir"; }; buildInputs = - [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip ] + [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; preBuild = @@ -24,15 +24,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc"; - - preInstall = - '' - sed -i \ - -e 's|SYS_PREFIX=|SYS_PREFIX=''${SYS_PREFIX-''${HOME}/.rabbitmq/${version}}|' \ - -e 's|CONF_ENV_FILE=''${SYS_PREFIX}\(.*\)|CONF_ENV_FILE=\1|' \ - scripts/rabbitmq-defaults - ''; + installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)"; + installTargets = "install install-man"; postInstall = '' |