Merge #1388: update rabbitmq-server and add lib

4 files changed, 31 insertions, 6 deletions

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 3dca6a04af7b..5e0a8560110b 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cmake, curl }:
 
 let
-  name = "libjson-rpc-cpp";
+  basename = "libjson-rpc-cpp";
   version = "0.2.1";
 in
 
 stdenv.mkDerivation {
-  name = "${name}-${version}";
+  name = "${basename}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/cinemast/${name}/archive/${version}.tar.gz";
+    url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz";
     sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw";
   };
 
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
 
   meta = {
     description = "C++ framework for json-rpc (json remote procedure call)";
+    homepage = https://github.com/cinemast/libjson-rpc-cpp;
+    license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
new file mode 100644
index 000000000000..84a7a9b4ccf7
--- /dev/null
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, openssl, popt, xmlto }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.1";
+  name = "rabbitmq-c-${version}";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93";
+  };
+
+  buildInputs = [ cmake openssl popt xmlto ];
+
+  meta = {
+    description = "RabbitMQ C AMQP client library";
+    homepage = https://github.com/alanxz/rabbitmq-c;
+    license = with stdenv.lib.licenses; mit;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 59788be15d11..4bb05a23fafc 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.0.3";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
-    sha256 = "07mp57xvszdrlgw8rgn9r9dpa6vdqdjk7f1dyh6a9sdg8s9fby38";
+    sha256 = "0j9yx64sdgkv0h20zjs65aa2ag6wwv50i6hd3x69m0cc6shzcc0f";
   };
 
   buildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       patchShebangs .
     '';
 
-  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man";
+  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc";
 
   preInstall =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5fccb23c3bc..e61452e1f545 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5409,6 +5409,8 @@ let
 
   qwt = callPackage ../development/libraries/qwt {};
 
+  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
+
   readline = readline6;
 
   readline4 = callPackage ../development/libraries/readline/readline4.nix { };