Merge pull request #11202 from wedens/rtv_update

rtv: 1.4.2 -> 1.6.1

pkgs/applications/misc/rtv/default.nix

@@ -1,25 +1,26 @@
-{ stdenv, fetchFromGitHub, pkgs, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.4.2";
+  version = "1.6.1";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "103ahwaaghxpih5bkbzqyqgxqmx6kc859vjla8fy8scg21cijghh";
+    sha256 = "0ywx4h37b25w36vln2ydpw73ysbbkpibp597cghsfn2izlaa0i02";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    requests
+    tornado
+    requests2
     six
     praw
     kitchen
     python.modules.curses
-  ];
+  ] ++ lib.optional (!pythonPackages.isPy3k) futures;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/michael-lazar/rtv;
     description = "Browse Reddit from your Terminal";
     license = licenses.mit;

pkgs/top-level/python-packages.nix

@@ -695,7 +695,6 @@ let
       url = "https://pypi.python.org/packages/source/a/atomiclong/atomiclong-${version}.tar.gz";
       sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb";
     };
-
     buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [ cffi ];
 
@@ -13044,7 +13043,7 @@ let
 
 
   praw = buildPythonPackage rec {
-    name = "praw-3.1.0";
+    name = "praw-3.3.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/praw/${name}.zip";
@@ -13052,6 +13051,7 @@ let
     };
 
     propagatedBuildInputs = with self; [
+      requests2
       decorator
       flake8
       mock