diff options
| author | Rushmore Mushambi <rushmore@webenchanter.com> | 2017-02-19 00:01:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-19 00:01:35 +0200 |
| commit | 23e2824d0f039eccb3c9cf8e00dd927757a561e9 (patch) | |
| tree | 248f63a9fb8e77d5fd3b301a119415dfc2ae0bff /pkgs | |
| parent | 492101dfce919350d1897f8c96ff402e7ca53827 (diff) | |
| parent | 3f09f8fa4d32fa532177858cf8c5e6b6ba9e36c4 (diff) | |
| download | nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.tar nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.tar.gz nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.tar.bz2 nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.tar.lz nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.tar.xz nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.tar.zst nixpkgs-23e2824d0f039eccb3c9cf8e00dd927757a561e9.zip | |
Merge pull request #22955 from rushmorem/czmq-update
czmq: v3.0.2 -> v4.0.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/czmq/3.x.nix (renamed from pkgs/development/libraries/czmq/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/czmq/4.x.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
3 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/3.x.nix index 69b64629bd8..69b64629bd8 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/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 00000000000..dd957d07340 --- /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 3bdd09ee723..67072b5128b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |