Merge branch 'master.upstream' into staging.upstream

pkgs/tools/networking/mosh/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty
-, makeWrapper, perl, openssl }:
+, makeWrapper, perl, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "mosh-1.2.5";
@@ -9,10 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s";
   };
 
-  buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
+  buildInputs = [
+    boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl
+  ] ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    # look for forkpty in libSystem, not libutil
+    substituteInPlace configure.ac \
+      --replace '[util]' '[System]' \
+      --replace 'LIBUTIL="-lutil"' 'LIBUTIL="-lSystem"'
+  '';
 
   postInstall = ''
-      wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
   '';
 
   meta = {

pkgs/tools/networking/netsniff-ng/default.nix

@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-121-gd91abbd"; in
+let version = "0.5.9-130-ga81b515"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "d91abbd912399a1d29cc77e4be7b7d6f94014180";
-    sha256 = "1smnmnjr9s4xlm2pc4l2dfc304b4acl6dsyi1gnprrr9amrwg798";
+    rev = "a81b515484828e0cff848fb7689d4a4b77f020d8";
+    sha256 = "0p65s9lpifagnb6mbw2la7zx2spckizd0pn5mp2zszn1nda5w0rq";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

pkgs/tools/networking/nzbget/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "nzbget-${version}";
-  version = "16.2";
+  version = "16.3";
 
   src = fetchurl {
     url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz";
-    sha256 = "19ww3cf1qvivdj2pk676g9gwvfkj5gasvwqnbisx9ihss4bmdx9r";
+    sha256 = "03xzrvgqh90wx183sjrcyn7yilip92g2x5wffnw956ywxb3nsy2g";
   };
 
   buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls