Merge branch 'master' into staging

Hydra: ?compare=1429281

3 files changed, 15 insertions, 13 deletions

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 079beedcc07c..29186906d27b 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.33.0";
+  version = "1.33.1";
 
   src = fetchFromGitHub {
     owner = "aria2";
     repo = "aria2";
     rev = "release-${version}";
-    sha256 = "07i9wrj7bs9770ppx943zgn8j9zvffxg2pib4w5ljxapqldhwrsq";
+    sha256 = "0ai84ijgsvnixwhxkj8if2mj9hcg2a41w81vy8bdvi89h3bmq9zf";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index 97780d546e43..a0bac7854c1d 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, python2Packages, writeText, writeScript
+{ stdenv, fetchFromGitHub, python3Packages, writeText, writeScript
 , coreutils, sqlite }:
 
+with python3Packages;
+
 let
   dbSql = writeText "create_pykms_db.sql" ''
     CREATE TABLE clients(
@@ -27,21 +29,21 @@ let
     fi
   '');
 
-in python2Packages.buildPythonApplication rec {
+in buildPythonApplication rec {
   name = "pykms-${version}";
-  version = "20170719";
+  version = "20171224";
 
   src = fetchFromGitHub {
     owner  = "ThunderEX";
     repo   = "py-kms";
-    rev    = "27355d88affd740330174a7c2bae9f50b9efce56";
-    sha256 = "0cpywj73jmyijjc5hs3b00argjsdwpqzmhawbxkx3mc2l4sgzc88";
+    rev    = "885f67904f002042d7758e38f9c5426461c5cdc7";
+    sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha";
   };
 
-  propagatedBuildInputs = with python2Packages; [ argparse pytz ];
+  propagatedBuildInputs = [ argparse pytz ];
 
   prePatch = ''
-    siteDir=$out/${python2Packages.python.sitePackages}
+    siteDir=$out/${python.sitePackages}
 
     substituteInPlace kmsBase.py \
       --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'"
@@ -60,7 +62,7 @@ in python2Packages.buildPythonApplication rec {
     mv * $siteDir
     for b in client server ; do
       chmod 0755 $siteDir/$b.py
-      makeWrapper ${python2Packages.python.interpreter} $out/bin/$b.py \
+      makeWrapper ${python.interpreter} $out/bin/$b.py \
         --add-flags $siteDir/$b.py
     done
 
@@ -68,7 +70,7 @@ in python2Packages.buildPythonApplication rec {
 
     mv $siteDir/README.md $out/share/doc/pykms/
 
-    ${python2Packages.python.interpreter} -m compileall $siteDir
+    ${python.interpreter} -m compileall $siteDir
 
     runHook postInstall
   '';
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 30ecf617873a..6f37e88f4f6d 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.20";
+  version = "5.3.0";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b";
+    sha256 = "01pfl1ap62hc27574sx1a4yaaf7hr2zkksspn5z97sgacl6h1rnf";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];