Merge older staging with added firefox-related updates

2018-06-29 21:06:39 +02:00
parent 18d78e2e48 2f4001f41a
commit 2059bf9e39
531 changed files with 900 additions and 1394 deletions
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "3to2";
  version = "1.1.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -21,7 +21,6 @@
 buildPythonPackage rec {
  pname = "APScheduler";
  version = "3.5.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -8,7 +8,6 @@

 buildPythonPackage rec {
  pname = "Flask-PyMongo";
-  name = "${pname}-${version}";
  version = "0.5.2";

  src = fetchPypi {
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "FormEncode";
  version = "1.3.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/GeoIP/default.nix
@@ -3,7 +3,6 @@
 , geoip, nose}:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "GeoIP";
  version = "1.3.2";

--- a/pkgs/development/python-modules/Pmw/default.nix
+++ b/pkgs/development/python-modules/Pmw/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "Pmw";
  version = "2.0.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -21,7 +21,6 @@ in
 buildPythonPackage rec {
  pname = "PyLD";
  version = "0.7.2";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "digitalbazaar";
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "Pygments";
  version = "2.2.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/pkgs/development/python-modules/ROPGadget/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "ROPGadget";
  version = "5.4";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -40,7 +40,6 @@ let
  libgpuarray_ = libgpuarray.override { inherit cudaSupport; };

 in buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "Theano";
  version = "1.0.2";

--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -16,7 +16,6 @@ let
 in buildPythonPackage rec {
  pname = "Wand";
  version = "0.4.4";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -1,7 +1,6 @@
 {lib, buildPythonPackage, fetchPypi}:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "XlsxWriter";
  version = "1.0.5";

--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "aafigure";
  version = "0.6";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/pkgs/development/python-modules/acme-tiny/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "acme-tiny";
  version = "2016-03-26";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -18,7 +18,6 @@ buildPythonPackage rec {
  inherit (certbot) src version;

  pname = "acme";
-  name = "${pname}-${version}";

  propagatedBuildInputs = [
    cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "acoustics";
  version = "0.1.2";
-  name = "${pname}-${version}";

  buildInputs = [ cython pytest ];
  propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "actdiag";
  version = "0.5.4";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "adal";
  version = "1.0.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "aenum";
  version = "2.1.2";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:

 buildPythonPackage rec {
-    name = "${pname}-${version}";
    pname = "agate-dbf";
    version = "0.2.0";

--- a/pkgs/development/python-modules/agate-excel/default.nix
+++ b/pkgs/development/python-modules/agate-excel/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }:

 buildPythonPackage rec {
-    name = "${pname}-${version}";
    pname = "agate-excel";
    version = "0.2.2";

--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }:

 buildPythonPackage rec {
-    name = "${pname}-${version}";
    pname = "agate-sql";
    version = "0.5.3";

--- a/pkgs/development/python-modules/agate/default.nix
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -3,7 +3,6 @@
  leather, python-slugify }:

 buildPythonPackage rec {
-    name = "${pname}-${version}";
    pname = "agate";
    version = "1.6.1";

--- a/pkgs/development/python-modules/aioamqp/default.nix
+++ b/pkgs/development/python-modules/aioamqp/default.nix
@@ -4,7 +4,6 @@

 buildPythonPackage rec {
  pname = "aioamqp";
-  name = "${pname}-${version}";
  version = "0.11.0";

  meta = {
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "aiodns";
  version = "1.1.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
  pname = "aiofiles";
  version = "0.3.2";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "alabaster";
  version = "0.7.11";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -4,7 +4,6 @@
 }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "alembic";
  version = "0.9.9";

--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "amqplib";
  version = "0.6.1";
-  name = "${pname}-${version}";

  src = fetchurl {
    url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz;
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "aniso8601";
  version = "3.0.2";
-  name = "${pname}-${version}";

  meta = with stdenv.lib; {
    description = "Parses ISO 8601 strings.";
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "ansicolor";
  version = "0.2.6";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:

 buildPythonPackage rec {
+  pname = "antlr4-python3-runtime";
  version = "4.7.1";
-  name = "antlr4-python3-runtime-${version}";
  disabled = !isPy3k;

-  src = fetchurl {
-    url = "mirror://pypi/a/antlr4-python3-runtime/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv";
  };

--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "apipkg";
  version = "1.4";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/appdirs/default.nix
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
  pname = "appdirs";
  version = "1.4.3";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/area53/default.nix
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "Area53";
  version = "0.94";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -2,7 +2,6 @@
  coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
 }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "argcomplete";
  version = "1.9.4";

--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "args";
  version = "0.1.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "asana";
  version = "0.7.0";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "asana";
--- a/pkgs/development/python-modules/asn1crypto/default.nix
+++ b/pkgs/development/python-modules/asn1crypto/default.nix
@@ -6,7 +6,6 @@
 buildPythonPackage rec {
  pname = "asn1crypto";
  version = "0.24.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/astor/default.nix
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "astor";
  version = "0.6.2";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -4,7 +4,6 @@
 }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "astroid";
  version = "1.6.5";

--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -5,7 +5,6 @@

 buildPythonPackage rec {
  pname = "audioread";
-  name = "${pname}-${version}";
  version = "2.1.6";

  src = fetchPypi {
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy3k, isPy33,
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
  unittest2, mock, pytest, trollius, asyncio,
  pytest-asyncio, futures,
  six, twisted, txaio, zope_interface
 }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "autobahn";
  version = "18.6.1";

-  src = fetchurl {
-    url = "mirror://pypi/a/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24";
  };

--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
  m2r, setuptools_scm, six, attrs }:
+
 buildPythonPackage rec {
  version = "0.7.0";
  pname = "Automat";
-  name = "${pname}-${version}";

-  src = fetchurl {
-    url = "mirror://pypi/A/Automat/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e";
  };

--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "autopep8";
  version = "1.3.5";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/backports_csv/default.nix
+++ b/pkgs/development/python-modules/backports_csv/default.nix
@@ -4,7 +4,6 @@ buildPythonPackage rec {

  pname = "backports.csv";
  version = "1.0.6";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/backports_tempfile/default.nix
+++ b/pkgs/development/python-modules/backports_tempfile/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
  pname = "backports.tempfile";
  version = "1.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/backports_unittest-mock/default.nix
+++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "backports.unittest_mock";
  version = "1.3";

--- a/pkgs/development/python-modules/backports_weakref/default.nix
+++ b/pkgs/development/python-modules/backports_weakref/default.nix
@@ -7,7 +7,6 @@
 }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "backports.weakref";
  version = "1.0.post1";
  src = fetchPypi {
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "bap";
  version = "1.3.1";
-  name = "${pname}-${version}";
  src = fetchFromGitHub {
    owner = "BinaryAnalysisPlatform";
    repo = "bap-python";
--- a/pkgs/development/python-modules/bash_kernel/default.nix
+++ b/pkgs/development/python-modules/bash_kernel/default.nix
@@ -11,7 +11,6 @@
 buildPythonPackage rec {
  pname = "bash_kernel";
  version = "0.7.1";
-  name = "${pname}-${version}";
  format = "flit";
  disabled = isPy27;

--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "bayespy";
  version = "0.5.17";
-  name = "${pname}-${version}";

  # Python 2 not supported and not some old Python 3 because MPL doesn't support
  # them properly.
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPyPy, fetchurl
+{ stdenv, buildPythonPackage, isPyPy, fetchPypi
 , cffi, pycparser, mock, pytest, py, six }:

 with stdenv.lib;
@@ -6,10 +6,9 @@ with stdenv.lib;
 buildPythonPackage rec {
  version = "3.1.4";
  pname = "bcrypt";
-  name = "${pname}-${version}";

-  src = fetchurl {
-    url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d";
  };
  buildInputs = [ pycparser mock pytest py ];
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, nose }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "beautifulsoup4";
  version = "4.6.0";

--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -7,7 +7,6 @@
 buildPythonApplication rec {
  pname = "behave";
  version = "1.2.6";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "bitcoin-price-api";
  version = "0.0.4";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/bitcoinlib/default.nix
@@ -4,7 +4,6 @@ let ext = if stdenv.isDarwin then "dylib" else "so";
 in buildPythonPackage rec {
  pname = "bitcoinlib";
  version = "0.9.0";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner  = "petertodd";
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "bitstring";
  version = "3.1.5";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/bkcharts/default.nix
+++ b/pkgs/development/python-modules/bkcharts/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
  pname = "bkcharts";
  version = "0.2";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit version pname;
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -2,7 +2,6 @@
 , glibcLocales }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "blessed";
  version = "1.15.0";

--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -8,13 +8,12 @@ let
  cryptsetupWithPython = cryptsetup.override pyenable;
 in buildPythonPackage rec {
  pname = "blivet";
-  name = "${pname}-${version}";
  version = "0.67";

  src = fetchFromGitHub {
    owner = "dwlehman";
    repo = "blivet";
-    rev = name;
+    rev = "${pname}-${version}";
    sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky";
  };

--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -10,7 +10,6 @@
 }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "botocore";
  version = "1.10.9";

--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
  pname = "branca";
  version = "0.3.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,12 +1,11 @@
-{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
+{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:

 buildPythonPackage rec {
  version = "4.9.1";
  pname = "breathe";
-  name = "${pname}-${version}";

-  src = fetchurl {
-    url = "mirror://pypi/b/breathe/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684";
  };

--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
  pname = "browsermob-proxy";
  version = "0.8.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -10,7 +10,6 @@
 buildPythonPackage rec {
  pname = "BTrees";
  version = "4.5.0";
-  name = "${pname}-${version}";

  buildInputs = [ transaction ];
  propagatedBuildInputs = [ persistent zope_interface ];
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,12 +1,11 @@
-{ fetchurl, stdenv, buildPythonPackage }:
+{ fetchPypi, stdenv, buildPythonPackage }:

 buildPythonPackage rec {
  pname = "zc.buildout";
  version = "2.11.5";
-  name = "${pname}-nix-${version}";

-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122";
  };

--- a/pkgs/development/python-modules/bz2file/default.nix
+++ b/pkgs/development/python-modules/bz2file/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "bz2file";
  version = "0.98";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/cachetools/1.nix
+++ b/pkgs/development/python-modules/cachetools/1.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, isPyPy }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "cachetools";
  version = "2.1.0";
  disabled = isPyPy;  # a test fails
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, isPyPy }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "cachetools";
  version = "2.1.0";

--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "CCColUtils";
  version = "1.5";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -3,7 +3,6 @@
 if isPyPy then null else buildPythonPackage rec {
  pname = "cffi";
  version = "1.11.5";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "chai";
  version = "1.1.2";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "chainmap";
  version = "1.0.2";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -3,7 +3,6 @@
 }:
 buildPythonPackage rec {
  pname = "channels";
-  name = "${pname}-${version}";
  version = "2.1.2";

  src = fetchPypi {
--- a/pkgs/development/python-modules/characteristic/default.nix
+++ b/pkgs/development/python-modules/characteristic/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "characteristic";
  version = "14.3.0";
-  name = "${pname}-${version}";
  src = fetchPypi {
    inherit pname version;
    sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380";
--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/pkgs/development/python-modules/cld2-cffi/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, six, cffi, nose }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "cld2-cffi";
  version = "0.1.4";

--- a/pkgs/development/python-modules/click-plugins/default.nix
+++ b/pkgs/development/python-modules/click-plugins/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "click-plugins";
  version = "1.0.3";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "cligj";
  version = "0.4.0";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "mapbox";
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "colorlover";
  version = "0.2.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  version = "0.11.4";
  pname = "confluent-kafka";

--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 }:
 buildPythonPackage rec {
  pname = "constantly";
-  name = "${pname}-${version}";
  version = "15.1.0";

-  src = fetchurl {
-    url = "mirror://pypi/c/constantly/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq";
  };

--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "contextlib2";
  version = "0.5.5";
-  name = "${pname}-${version}";

  src = fetchPypi rec {
    inherit pname version;
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
  pname = "coverage";
  version = "4.5.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/csscompressor/default.nix
+++ b/pkgs/development/python-modules/csscompressor/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
  pname = "csscompressor";
  version = "0.9.5";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "cufflinks";
  version = "0.13.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/cycler/default.nix
+++ b/pkgs/development/python-modules/cycler/default.nix
@@ -9,7 +9,6 @@

 buildPythonPackage rec {
  pname = "cycler";
-  name = "${pname}-${version}";
  version = "0.10.0";

  src = fetchPypi {
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -13,7 +13,6 @@
 buildPythonPackage rec {
  pname = "dask";
  version = "0.18.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,6 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }:
 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "python-dateutil";
  version = "2.7.3";

--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage }:

 buildPythonPackage rec {
-    name = "${pname}-${version}";
    pname = "dbfread";
    version = "2.0.7";

--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -4,11 +4,10 @@
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
  pname = "dbus-python";
  version = "1.2.4";
-  name = "${pname}-${version}";
  format = "other";

  src = fetchurl {
-    url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
+    url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz";
    sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2";
  };

--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "demjson";
  version = "2.2.4";
-  name = "${pname}-${version}";
  disabled = isPy36;

  src = fetchPypi {
--- a/pkgs/development/python-modules/descartes/default.nix
+++ b/pkgs/development/python-modules/descartes/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "descartes";
  version = "1.1.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, requests, py, pytest }:

-with pythonPackages;buildPythonPackage rec {
+buildPythonPackage rec {
  pname = "devpi-common";
  version = "3.2.3";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
@@ -17,7 +16,7 @@ with pythonPackages;buildPythonPackage rec {
    py.test
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    homepage = https://github.com/devpi/devpi;
    description = "Utilities jointly used by devpi-server and devpi-client";
    license = licenses.mit;
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -2,7 +2,6 @@

 buildPythonPackage rec {
  pname = "diff-match-patch";
-  name = "${pname}-${version}";
  version = "20121119";

  meta = {
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
  pname = "dill";
  version = "0.2.8.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "discid";
  version = "1.1.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/discogs_client/default.nix
+++ b/pkgs/development/python-modules/discogs_client/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "discogs-client";
  version = "2.2.1";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/distorm3/default.nix
+++ b/pkgs/development/python-modules/distorm3/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, buildPythonPackage, fetchurl }:
+{ stdenv, buildPythonPackage, fetchPypi }:

 buildPythonPackage rec {
  pname = "distorm3";
  version = "3.3.4";
-  name = "${pname}-${version}";

-  src = fetchurl {
-    url = "mirror://pypi/d/${pname}/${name}.zip";
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
    sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4";
  };

--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -3,7 +3,6 @@

 buildPythonPackage rec {
  pname = "django-allauth";
-  name = "${pname}-${version}";
  version = "0.36.0";

  # no tests on PyPI
--- a/Show More
+++ b/Show More