Merge branch 'master' into staging

pkgs/development/libraries/fstrm/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent }:
+
+stdenv.mkDerivation rec {
+  name = "fstrm-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "farsightsec";
+    repo = "fstrm";
+    rev = "v${version}";
+    sha256 = "1n8hpywjgkzm0xh0hvryf5r6v2sbpgr3qy0grxq9yha7kqcam4f3";
+  };
+
+  outputs = [ "bin" "out" "dev" ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libevent ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Frame Streams implementation in C";
+    homepage = https://github.com/farsightsec/fstrm;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+  };
+}
+

pkgs/development/libraries/ndpi/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
+
+let version = "1.8"; in
+
+stdenv.mkDerivation rec {
+  name = "ndpi-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ntop";
+    repo = "nDPI";
+    rev = "${version}";
+    sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4";
+  };
+
+  configureScript = "./autogen.sh";
+
+  nativeBuildInputs = [which autoconf automake libtool];
+  buildInputs = [libpcap];
+
+  meta = with stdenv.lib; {
+    description = "A library for deep-packet inspection";
+    longDescription = ''
+      nDPI is a library for deep-packet inspection based on OpenDPI.
+    '';
+    homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/;
+    license = with licenses; lgpl3;
+    maintainers = with maintainers; [ takikawa ];
+    platforms = with platforms; unix;
+  };
+}

pkgs/development/libraries/rocksdb/default.nix

@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "4.13";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "v${version}";
-    sha256 = "1bxyykj13mw48yk108bkmxlfrp6bd95f27bysayax4lqxkgx0zzw";
+    sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ];

pkgs/development/libraries/wolfssl/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.9.10b";
+  version = "3.10.3";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}";
-    sha256 = "1hx543kxi4fpxww0y2c05kaav99zmnxm81rq7v7d87qzmvw2g4gx";
+    sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];