about summary refs log tree commit diff
path: root/pkgs/development/python-modules/urlgrabber
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-17 09:39:23 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-17 09:39:23 +0200
commitfe9a3e3e63fa59c8014d454b0efd3231bdd19350 (patch)
tree3546e83902366b34599e8d5f6a698e37935a104d /pkgs/development/python-modules/urlgrabber
parented3cb39bfa7234e5bbf2b50ce6f658ef5fda686a (diff)
parentc68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/python-modules/urlgrabber')
-rw-r--r--pkgs/development/python-modules/urlgrabber/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index 940f623418748..31e6e6a066a71 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, pycurl, isPy3k }:
+{ stdenv, buildPythonPackage, fetchPypi, pycurl, six }:
 
 buildPythonPackage rec {
   pname = "urlgrabber";
-  version = "3.10.2";
-
-  disabled = isPy3k;
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0w1h7hlsq406bxfy2pn4i9bd003bwl0q9b7p03z3g6yl0d21ddq5";
+    sha256 = "0fazs574fgixd525cn2dh027f4qf0c0gbwcfyfkhc6fkblfa1ibr";
   };
 
-  propagatedBuildInputs = [ pycurl ];
+  propagatedBuildInputs = [ pycurl six ];
 
   meta = with stdenv.lib; {
     homepage = http://urlgrabber.baseurl.org;
@@ -20,4 +18,3 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ qknight ];
   };
 }
-