Merge branch 'master.upstream' into staging.upstream

2015-11-04 01:00:48 -08:00
parent b983c6b9b5 86ba275a99
commit 4251612faa
147 changed files with 2870 additions and 721 deletions
@@ -2,11 +2,11 @@
 , geoip, gperftools }:

 stdenv.mkDerivation rec {
-  name = "bro-2.4";
+  name = "bro-2.4.1";
  
  src = fetchurl {
    url = "http://www.bro.org/downloads/release/${name}.tar.gz";
-    sha256 = "1ch8w8iakr2ajbigaad70b6mfv01s2sbdqgmrqm9q9zc1c5hs33l";
+    sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq";
  };
  
  buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip