summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-02-13 21:28:54 +0000
committerDomen Kožar <domen@dev.si>2016-02-13 21:28:54 +0000
commit3a538e674d6b4f80e298b5b718ba28fbb3b1224f (patch)
tree52edd9d079357be461fd5f234a08a14abf25d8fa
parentb3f54c324cbfc8eaf513908a75790a1660fdf377 (diff)
parentb6586ee69433f9ae60698d10a1ffcb09040282d1 (diff)
Merge pull request #12977 from jasedit/update_zeromq_4.1.4
Updating ZeroMQ to 4.1.4
-rw-r--r--pkgs/development/libraries/zeromq/4.x.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 22e2e8716a62c..d99879d14a7ee 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,24 +1,16 @@
 { stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.1.3";
+  name = "zeromq-4.1.4";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "04gligbgr0phipjkwc0dyk1vr9306r6s4dbj85z7fxxk1n1ircv1";
+    sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9";
   };
 
-  # Fix zeromq-4.1.3 with libsodium-1.0.6
-  postPatch = ''
-    sed -i 's/libzmq_werror="yes"/libzmq_werror="no"/' configure
-  '';
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libuuid libsodium ];
 
-  # https://github.com/zeromq/libzmq/commit/479db2113643e459c11db392e0fefd6400657c9e
-  patches = [ ./sodium_warning.patch ];
-
   meta = with stdenv.lib; {
     branch = "4";
     homepage = "http://www.zeromq.org";