8 files changed, 86 insertions, 32 deletions
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index b98570a7341b..380dd6764119 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,25 +1,29 @@
 { stdenv, fetchurl, libsodium, pkgconfig, systemd }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
+    url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
     sha256 = "16lif3qhyfjpgg54vjlwpslxk90akmbhlpnn1szxm628bmpw6nl9";
   };
 
   configureFlags = ''
-    ${stdenv.lib.optionalString stdenv.isLinux "--with-systemd"}
+    ${optionalString stdenv.isLinux "--with-systemd"}
   '';
 
-  buildInputs = [ pkgconfig libsodium ] ++ stdenv.lib.optional stdenv.isLinux systemd;
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd;
 
   meta = {
     description = "A tool for securing communications between a client and a DNS resolver";
-    homepage = http://dnscrypt.org/;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ joachifm jgeerds ];
-    platforms = stdenv.lib.platforms.all;
+    homepage = https://dnscrypt.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ joachifm jgeerds ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index f443e5450482..03204d6ccf31 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, libsodium, libevent, pkgconfig, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }:
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-wrapper-${version}";
   version = "0.2";
 
-  src = fetchurl {
-    url = "https://github.com/Cofyc/dnscrypt-wrapper/releases/download/v0.2/dnscrypt-wrapper-v0.2.tar.bz2";
-    sha256 = "0kh52dc0v9lxwi39y88z0ab6bwa5bcw8b24psnz72fv555irsvyj";
+  src = fetchFromGitHub {
+    owner = "Cofyc";
+    repo = "dnscrypt-wrapper";
+    rev = "v${version}";
+    sha256 = "06m6p79y0p6f1knk40fbi7dnc5hnq066kafvrq74fxrl51nywjbg";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook libsodium libevent ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ libsodium libevent ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for adding dnscrypt support to any name resolver";
-    homepage = http://dnscrypt.org/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://dnscrypt.org/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tstrobel joachifm ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index c76c6d0dd7f4..1f3a09e63f9c 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2015.71";
+  name = "dropbear-2016.72";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "1bw3lzmisn6gs6zy9vcqbfnicl437ydskqcayklpw60fkhb18qip";
+    sha256 = "10fnlaf6rm537v3rml1gnd58d42plv2q5cp7svbrysap69npc8wk";
   };
 
   dontDisableStatic = enableStatic;
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 2d490b917a4e..454d3b418187 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.4.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "1nkf3dplvyg2lgygd3jd4bqh5s4nm6ppyks3a05a1dcbwm8ws42y";
+    sha256 = "17qf2pbxf05iw2gzyc5bc2zg3a4ns6zf1pm8q9j7nqhchh1rv4cm";
   };
 
   buildInputs = [ boost zlib openssl ];
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 00061b3aeff1..9c305791bda8 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildPythonApplication, sqlite3 }:
 
 buildPythonApplication rec {
-  version = "6.6.1";
+  version = "6.7.0";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "0nn1qkxqy84h0a2acd1yx861wslh2fjfznkcq15856npbd34yqy5";
+    sha256 = "127d7zy8h2h67bvrc4x98wcfskmkxislsv9qnvpgxlc56vnsrg54";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6c6c479a4fd3..11ea1de89cf4 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -2,12 +2,13 @@
 , etcDir ? null
 , hpnSupport ? false
 , withKerberos ? false
-, withGssapiPatches ? withKerberos
+, withGssapiPatches ? false
 , kerberos
 , linkOpenssl? true
 }:
 
 assert withKerberos -> kerberos != null;
+assert withGssapiPatches -> withKerberos;
 
 let
 
@@ -17,18 +18,20 @@ let
   };
 
   gssapiSrc = fetchpatch {
-    url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2";
-    sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm";
+    url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35";
+    sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5";
   };
 
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-7.2p1";
+  # Please ensure that openssh_with_kerberos still builds when
+  # bumping the version here!
+  name = "openssh-7.2p2";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1hsa1f3641pdj57a55gmnvcya3wwww2fc2cvb77y95rm5xxw6g4p";
+    sha256 = "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7";
   };
 
   prePatch = optionalString hpnSupport
@@ -81,7 +84,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = "http://www.openssh.org/";
+    homepage = "http://www.openssh.com/";
     description = "An implementation of the SSH protocol";
     license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 10b35298461b..80bcb7ae9879 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,12 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "0.3.1";
-  namePrefix = "";
+  version = "0.3.4";
   
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "0ln2grbskh39ph79lhcim2axm7hp4xhzbrag8xfqbfihq7jdm6ya";
+    sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
new file mode 100644
index 000000000000..28d3f2c16336
--- /dev/null
+++ b/pkgs/tools/networking/uget/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer,
+  gst_plugins_base, gst_plugins_good, gnome3, makeWrapper, aria2 ? null }:
+
+stdenv.mkDerivation rec {
+  name = "uget-${version}";
+  version = "2.0.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/urlget/${name}.tar.gz";
+    sha256 = "0cqz8cd8dyciam07w6ipgzj52zhf9q0zvg6ag6wz481sxkpdnfh3";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool makeWrapper ];
+  
+  buildInputs = [
+    openssl curl libnotify gstreamer gst_plugins_base gst_plugins_good
+    gnome3.gtk gnome3.dconf
+  ]
+  ++ (stdenv.lib.optional (aria2 != null) aria2);
+
+  enableParallelBuilding = true;
+  
+  preFixup = ''
+    wrapProgram $out/bin/uget-gtk \
+      ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Download manager using gtk+ and libcurl";
+    longDescription = ''
+      uGet is a VERY Powerful download manager application with a large
+      inventory of features but is still very light-weight and low on
+      resources, so don't let the impressive list of features scare you into
+      thinking that it "might be too powerful" because remember power is good
+      and lightweight power is uGet!
+    '';
+    license = licenses.lgpl21;
+    homepage = http://www.ugetdm.com;
+    maintainers = with maintainers; [ romildo ];
+    platforms = platforms.unix;
+  };
+}