summary refs log tree commit diff
diff options
context:
space:
mode:
authorwedens <kirill.wedens@gmail.com>2015-11-22 11:14:42 +0600
committerwedens <kirill.wedens@gmail.com>2015-11-22 17:19:35 +0600
commit5cbc71c104d09963f136e2a5e6faa770083c2358 (patch)
treee8a9251b4a2f1d9294235b3636b7718535b11bc0
parenta2aab3a224939cc7c24e88984c5f5ab169aee271 (diff)
downloadnixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.tar
nixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.tar.gz
nixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.tar.bz2
nixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.tar.lz
nixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.tar.xz
nixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.tar.zst
nixpkgs-5cbc71c104d09963f136e2a5e6faa770083c2358.zip
rtv: 1.4.2 -> 1.6.1
-rw-r--r--pkgs/applications/misc/rtv/default.nix13
-rw-r--r--pkgs/top-level/python-packages.nix4
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 37a664a4918..f67797fbe86 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/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;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04d68744dab..6d2e2d56897 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/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 ];
 
@@ -13049,7 +13048,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";
@@ -13057,6 +13056,7 @@ let
     };
 
     propagatedBuildInputs = with self; [
+      requests2
       decorator
       flake8
       mock