From 3f09f8fa4d32fa532177858cf8c5e6b6ba9e36c4 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sat, 18 Feb 2017 21:24:49 +0200
Subject: [PATCH] czmq: v3.0.2 -> v4.0.2

---
 .../libraries/czmq/{default.nix => 3.x.nix}   |  0
 pkgs/development/libraries/czmq/4.x.nix       | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 ++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/czmq/{default.nix => 3.x.nix} (100%)
 create mode 100644 pkgs/development/libraries/czmq/4.x.nix

diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/3.x.nix
similarity index 100%
rename from pkgs/development/libraries/czmq/default.nix
rename to pkgs/development/libraries/czmq/3.x.nix
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
new file mode 100644
index 000000000000..dd957d07340c
--- /dev/null
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, zeromq }:
+
+stdenv.mkDerivation rec {
+  version = "4.0.2";
+  name = "czmq-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340";
+  };
+
+  # Needs to be propagated for the .pc file to work
+  propagatedBuildInputs = [ zeromq ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://czmq.zeromq.org/";
+    description = "High-level C Binding for ZeroMQ";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 197b2970b463..e647d2ab237d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -945,6 +945,7 @@ with pkgs;
 
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
+    czmq = czmq3;
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {
@@ -9998,9 +9999,13 @@ with pkgs;
 
   cppzmq = callPackage ../development/libraries/cppzmq {};
 
-  czmq = callPackage ../development/libraries/czmq { };
+  czmq3 = callPackage ../development/libraries/czmq/3.x.nix {};
+  czmq4 = callPackage ../development/libraries/czmq/4.x.nix {};
+  czmq = czmq4;
 
-  czmqpp = callPackage ../development/libraries/czmqpp { };
+  czmqpp = callPackage ../development/libraries/czmqpp {
+    czmq = czmq3;
+  };
 
   zimlib = callPackage ../development/libraries/zimlib { };