Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'

v#	modified:   nixpkgs/pkgs/tools/networking/dhcpcd/default.nix

1 files changed, 24 insertions, 18 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix
index 0b3571055bea..2a3d85c2b35b 100644
--- a/nixpkgs/pkgs/development/python-modules/praw/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/praw/default.nix
@@ -1,47 +1,53 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
-, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
+, betamax
+, betamax-serializers
+, betamax-matchers
+, mock
+, six
+, pytestrunner
+, prawcore
+, pytest
+, requests-toolbelt
+, update_checker
+, websocket_client
 }:
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "6.0.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
     rev = "v${version}";
-    sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
+    sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky";
   };
 
-  postPatch = ''
-    # drop upper bound of prawcore requirement
-    sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py
-  '';
+  nativeBuildInputs = [
+    pytestrunner
+  ];
 
   propagatedBuildInputs = [
-    requests
-    decorator
-    flake8
     mock
-    six
-    update_checker
-    pytestrunner
     prawcore
+    update_checker
+    websocket_client
   ];
 
   checkInputs = [
-    pytest_3
     betamax
     betamax-serializers
     betamax-matchers
-    requests_toolbelt
+    mock
+    pytest
+    requests-toolbelt
+    six
   ];
 
   meta = with stdenv.lib; {
     description = "Python Reddit API wrapper";
-    homepage = https://praw.readthedocs.org/;
-    license = licenses.gpl3;
+    homepage = "https://praw.readthedocs.org/";
+    license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ ];
   };