Merge pull request #22955 from rushmorem/czmq-update

czmq: v3.0.2 -> v4.0.2
This commit is contained in:
Rushmore Mushambi 2017-02-19 00:01:35 +02:00 committed by GitHub
commit 23e2824d0f
3 changed files with 29 additions and 2 deletions

View File

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

View File

@ -947,6 +947,7 @@ with pkgs;
rsyslog = callPackage ../tools/system/rsyslog {
hadoop = null; # Currently Broken
czmq = czmq3;
};
rsyslog-light = callPackage ../tools/system/rsyslog {
@ -10000,9 +10001,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 { };