From 3dd9f61d0d81fd40c24f5a97e3cd66bc2d808250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <cpages@aqsense.com>
Date: Tue, 12 Nov 2013 12:38:29 +0100
Subject: [PATCH 1/4] rabbitmq-server: update to 3.2.1

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

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 59788be15d1..c404a56aef2 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)/doc";
 
   preInstall =
     ''

From e794dc6a2080e84339c0610d23f36fd517812491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <cpages@aqsense.com>
Date: Fri, 13 Dec 2013 17:10:06 +0100
Subject: [PATCH 2/4] rabbitmq-c: add version 0.4.1

---
 .../libraries/rabbitmq-c/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/rabbitmq-c/default.nix

diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
new file mode 100644
index 00000000000..84a7a9b4ccf
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be875c2a88e..129d9364de9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5575,6 +5575,8 @@ let
 
   qwt = callPackage ../development/libraries/qwt {};
 
+  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
+
   readline = readline6;
 
   readline4 = callPackage ../development/libraries/readline/readline4.nix { };

From d02b0a182819819a7895679126c1665506dbccc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <cpages@aqsense.com>
Date: Fri, 13 Dec 2013 17:33:13 +0100
Subject: [PATCH 3/4] libjson-rpc-cpp: minor fixes to the expression.

---
 pkgs/development/libraries/libjson-rpc-cpp/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 3dca6a04af7..5e0a8560110 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;
   };
 }

From 01b0d1c926472449474bf3486792bb5eb2c75b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jan 2014 14:15:10 +0100
Subject: [PATCH 4/4] rabbitmq: move docs: $out/docs -> $out/share/docs

As pointed out by @bjornfor, we mostly have it under share.
---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index c404a56aef2..4bb05a23faf 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       patchShebangs .
     '';
 
-  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/doc";
+  installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man DOC_INSTALL_DIR=$(out)/share/doc";
 
   preInstall =
     ''