Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-08-17 09:39:23 +02:00
174 changed files with 4833 additions and 1993 deletions

View File

@@ -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 ];
};
}