Merge remote-tracking branch 'origin/master' into closure-size

21 files changed, 128 insertions, 231 deletions

diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
index aad3b769fe28..3c8e96547259 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -33,7 +33,7 @@ in nodePackages.buildNodePackage rec {
     license = licenses.mit;
     homepage = https://github.com/emblica/airfield;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     broken = true;
   };
 }
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 8726f4aae219..017492f28b5b 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   name = "axel-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
-    sha256 = "0dl0r9byd2ps90cq2nj1y7ib6gnkb5y9f3a3fmhcnjrm9smmg6im";
+    sha256 = "10qsmfq2aprrxsm8sshpvzjjpxhmyv89mrik4clw9rprwxknfdq2";
   };
 
+  buildInputs = [ gettext ];
+
+  installFlags = [ "ETCDIR=$(out)/etc" ];
+
   meta = with stdenv.lib; {
     description = "Console downloading program with some features for parallel connections for faster downloading";
     homepage = http://axel.alioth.debian.org/;
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 96003d85218e..46f923df4e9e 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A TLS terminating proxy";
     license     = licenses.mit;
-    platforms   = with platforms; linux;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
   };
 }
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index 4f0b68ce4bec..985cb0c3015a 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
     license = licenses.mit;
     homepage = https://github.com/Soulou/curl-unix-socket;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index cbc5a20997cc..c706984e8356 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -2,14 +2,14 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "5.4.3";
+  version = "5.5.2";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner  = "datadog";
     repo   = "dd-agent";
     rev    = version;
-    sha256 = "07cign0ydxf1h6xsyi3iviywlm9x6d6rcaz46f3wipby6mv1s5dc";
+    sha256 = "0ga7h3rdg6q2pi4dxxkird5nf6s6hc13mj1xd9awwpli48gyvxn7";
   };
 
   buildInputs = [
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     pythonPackages.pyyaml
     pythonPackages.requests
     pythonPackages.pymongo
+    pythonPackages.docker
   ];
   propagatedBuildInputs = [ python tornado ];
 
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 432411c1460d..83a26f98d8b6 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display.";
     homepage = https://github.com/deiv/driftnet;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index 1c83e08fc3e0..fe5581039256 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -1,33 +1,30 @@
-a @ { openssl, gmp, nettools, iproute, zlib, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    openssl gmp zlib
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:
+
+stdenv.mkDerivation rec {
+  name = "gvpe-${version}";
+  version = "2.25";
+
+  src = fetchurl {
+    url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
+    sha256 = "1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk";
+  };
+
+  buildInputs = [ openssl gmp zlib ];
 
-  inherit (s) name;
-  inherit buildInputs;
   configureFlags = [
     "--enable-tcp"
     "--enable-http-proxy"
     "--enable-dns"
     ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
-  preBuild = a.fullDepEntry (''
-    sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
-    sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C
-  '') ["minInit" "doUnpack"];
+  preBuild = ''
+    sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
+    sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C
+  '';
 
   meta = {
-    description = "A proteted multinode virtual network";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms; linux ++ freebsd;
+    description = "A protected multinode virtual network";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = with stdenv.lib.platforms; linux ++ freebsd;
   };
 }
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 31a47d2e4414..aecc0bb63fa3 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://code.gerade.org/hans/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index dd28345a48d2..4007ec4add19 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -1,21 +1,27 @@
-{ stdenv, fetchFromGitHub, boost, cryptopp }:
+{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }:
 
 stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "0.10.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "11w62rc326rhj2xh06307ngx0fai30qny8ml6n5lrx2y1dzjfxd1";
+    sha256 = "06y6pi0wlxpasncm4qq30sh0cavwl2f4gdz0hss70if8mr6z9hyq";
   };
 
-  buildInputs = [ boost cryptopp ];
+  buildInputs = [ boost zlib openssl ];
+  makeFlags = "USE_AESNI=no";
+  patches = [ (fetchpatch {
+    url = https://github.com/PurpleI2P/i2pd/commit/4109ab1590791f3c1bf4e9eceec2d43be7b5ea47.patch;
+    sha256 = "17zg9iah59icy8nn1nwfnsnbzpafgrsasz1pmb2q4iywb7wbnkzi";
+  }) ];
+
   installPhase = ''
-    install -D i2p $out/bin/i2p
+    install -D i2p $out/bin/i2pd
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 5d05677bb29a..761dc01d2f98 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl }:
 
 stdenv.mkDerivation rec {
-  name = "isync-1.2.0";
+  name = "isync-1.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/isync/${name}.tar.gz";
-    sha256 = "0n8fwvv88h7ps7qs122kgh1yx5308765fiwqav5h7m272vg7hf43";
+    sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7";
   };
 
   buildInputs = [ openssl pkgconfig db cyrus_sasl ];
diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 2dcfd09bb777..c83bc61bbcd0 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -23,10 +23,12 @@ stdenv.mkDerivation {
     sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure
   '';
 
+  configureFlags = [ "--mandir=$out/share/man/" ];
+
   meta = with stdenv.lib; {
     description = "Command line FTP (File Transfer Protocol) client";
     homepage = http://www.ncftp.com/ncftp/;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 9d8095b0a5f1..07bd9fd8c1a2 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://netsniff-ng.org/;
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 5b95dd159bff..e7176ba90b3b 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -12,12 +12,14 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
 
-  buildInputs = [ iproute lzo openssl pam pkgconfig ] ++ optional stdenv.isLinux systemd;
+  buildInputs = [ lzo openssl pkgconfig ]
+                  ++ optionals stdenv.isLinux [ pam systemd iproute ];
 
   configureFlags = ''
     --enable-password-save
-    --enable-iproute2
+  '' + optionalString stdenv.isLinux ''
     --enable-systemd
+    --enable-iproute2
     IPROUTE=${iproute}/sbin/ip
   '';
 
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index af5b9aacffcc..3d5ed7b34cae 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -1,57 +1,30 @@
-x@{builderDefsPackage
-  , python, makeWrapper
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, python }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="philter";
-    version="1.1";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${baseName}/${name}.tar.gz";
-    hash="177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
+stdenv.mkDerivation rec {
+  name = "philter-${version}";
+  version = "1.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/philter/${name}.tar.gz";
+    sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["installProgram" "patchShebangs" "wrapBinContentsPython"];
-  patchShebangs = (a.doPatchShebangs "$out/bin");
 
-  installProgram = a.fullDepEntry(''
-    mv "$out/share/philter/".*rc "$out/share/philter/philterrc"
-    mkdir -p "$out/bin"
-    cp "$out/share/philter/src/philter.py" "$out/bin/philter"
-    chmod a+x "$out/bin/philter"
-  '') ["addInputs" "copyToShare" "minInit"];
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/philter}
+    cp .philterrc "$out"/share/philter/philterrc
+    sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py
+    cp src/philter.py "$out"/bin/philter
+    chmod +x "$out"/bin/philter
+  '';
 
-  copyToShare = (a.simplyShare "philter");
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mail sorter for Maildirs";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://philter.sourceforge.net/";
     };
   };
-}) x
-
+}
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index fd5964cb55fc..a0a0efa85baf 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/pkgs/tools/networking/ripmime/default.nix
@@ -1,51 +1,29 @@
-x@{builderDefsPackage
-  
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ripmime";
-    version="1.4.0.10";
-    name="${baseName}-${version}";
-    url="http://www.pldaniels.com/${baseName}/${name}.tar.gz";
-    hash="0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "ripmime";
+  version = "1.4.0.10";
+  src = fetchurl {
+    url = "http://www.pldaniels.com/${pname}/${name}.tar.gz";
+    sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixTarget" "doMakeInstall"];
-  fixTarget = a.fullDepEntry (''
+  preInstall = ''
     sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" -e "s@man/man1@share/&@"
     mkdir -p "$out/bin" "$out/share/man/man1"
-  '') ["doUnpack" "minInit" "defEnsureDir"];
-      
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "Attachment extractor for MIME messages";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with maintainers; [ raskin ];
+    homepage = http://www.pldaniels.com/ripmime/;
+    platforms = with platforms; linux;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://www.pldaniels.com/ripmime/";
     };
   };
-}) x
-
+}
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index fcbb5f63d825..4651dab7e67e 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -1,42 +1,29 @@
-a @ {ppp, ...} :
+{ stdenv, fetchurl, ppp } :
 let
-  fetchurl = a.fetchurl;
-
-  version = a.lib.attrByPath ["version"] "3.11" a;
-  buildInputs = with a; [
-    ppp
-  ];
+  version = "3.12";
 in
-rec {
+stdenv.mkDerivation rec {
+  name = "rp-pppoe-" + version;
   src = fetchurl {
     url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
-    sha256 = "083pfjsb8w7afqgygbvgndwajgwkfmcnqla5vnk4z9yf5zcs98c6";
+    sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["exportVars" "doConfigure" "patchInstall" "makeDirs" "doMakeInstall"];
+  buildInputs = [ ppp ];
 
-  goSrcDir = "cd src";
-  exportVars = a.noDepEntry(''
-    export PATH="$PATH:${a.ppp}/sbin"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${a.ppp}/lib/${a.ppp.version}"
-    export PPPD=${a.ppp}/sbin/pppd
-  '');
 
-  patchInstall = a.fullDepEntry(''
-    sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@'
-    sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
-  '') ["minInit" "doUnpack"];
+  preConfigure = ''
+    cd src
+    export PPPD=${ppp}/sbin/pppd
+  '';
+  postConfigure = ''
+    sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@'
+    sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@'
+  '';
 
-  makeDirs = a.fullDepEntry(''
-    mkdir -p $out/share/${name}/etc/ppp
-  '') ["minInit" "defEnsureDir"];
-
-  name = "rp-pppoe-" + version;
   meta = {
     description = "Roaring Penguin Point-to-Point over Ethernet tool";
+    platforms = stdenv.lib.platforms.linux;
+    homepage = https://www.roaringpenguin.com/products/pppoe;
   };
 }
diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix
deleted file mode 100644
index 1ab3e062ca00..000000000000
--- a/pkgs/tools/networking/s3sync/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, ruby, makeWrapper }:
-
-stdenv.mkDerivation {
-  name = "s3sync-1.2.6";
-
-  src = fetchurl {
-    url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!!
-    sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f";
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  installPhase =
-    ''
-      mkdir -p $out/libexec/s3sync
-      cp *.rb $out/libexec/s3sync
-      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd
-      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync
-
-      mkdir -p $out/share/doc/s3sync
-      cp README* $out/share/doc/s3sync/
-    ''; # */
-
-  meta = {
-    homepage = http://s3sync.net/;
-    description = "Command-line tools to manipulate Amazon S3 buckets";
-    license = stdenv.lib.licenses.free; # some custom as-is in file headers
-  };
-}
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index c88b0b2dbe33..57dd43cbb444 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -1,48 +1,24 @@
-x@{builderDefsPackage
-  , tcp_wrappers
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, tcp_wrappers }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="tftp-hpa";
-    version="5.2";
-    name="${baseName}-${version}";
-    url="mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
-    hash="afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b";
+stdenv.mkDerivation rec {
+  name = "tftp-hpa-${version}";
+  version="5.2";
+  src = fetchurl {
+    url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
+    sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "TFTP tools - a lot of fixes on top of BSD TFTP";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.bsd3;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
+    license = licenses.bsd3;
+    homepage = http://www.kernel.org/pub/software/network/tftp/;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://www.kernel.org/pub/software/network/tftp/";
     };
   };
-}) x
-
+}
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 81b143921379..b8a58db2d1e3 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-09-25";
+  name = "tinc-1.1pre-2015-11-07";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "73068238436d8a22abb86e67b08f573b09fd04e1";
-    sha256 = "1j8bvvzvciy21s24jdpi089svy7wipg9pm84s98xjlp2plchj5dj";
+    rev = "bdd84660c756437cf3bc8f64adf612055acc84ea";
+    sha256 = "1vkpdn3gjlrrm0rfpbhz410mpcq16xy0ilvgkxsgifc9xgdgflmn";
   };
 
   nativeBuildInputs = [ autoreconfHook texinfo ];
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index db30562babed..941acbc016ff 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,11 +3,11 @@
 , libiconv, libpsl, openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.16.3";
+  name = "wget-1.17";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "0dzv5xf9qxc2bp4cyifmaghh3h464wbm73xiwcrvckf1ynqbgxv7";
+    sha256 = "11xvs919a8xr595hs6hk323rkk7yshyfdfyfdhlahagkrcxdcsdx";
   };
 
   patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index f38b3becf4c7..d9a50d7dc696 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.0.5";
+  version = "1.1.0";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "6e2de5477fefdab21802b1047d753ac38c85074a7d6b41387125fd6941f25ab2";
+    sha256 = "2d7ff178bd7fd284ebb7011d8a91bde51befda60f100eb5429a2dcb6626cf676";
   };
 
   preConfigure = ''