treewide: name -> pname (easy cases) (#66585)

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 12:41:18 +00:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -2,7 +2,6 @@
 buildPythonPackage rec {
    pname = "augeas";
    version = "1.0.3";
-    name = pname + "-" + version;

    src = fetchFromGitHub {
      owner = "hercules-team";
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -16,7 +16,7 @@
 let visualizationSupport = (pyqtgraph != null);
 in
 buildPythonPackage rec {
-  name = "binwalk-${version}";
+  pname = "binwalk";
  version = "2.1.1";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "blockdiag";
  version = "1.5.3";
-  name = pname + "-" + version;

  src = fetchurl {
    url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -9,7 +9,6 @@
 buildPythonPackage rec {
  pname = "Bottleneck";
  version = "1.2.1";
-  name = pname + "-" + version;

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

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

  buildInputs = [ pep8 nose ];
  # Pep8 tests fail...
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "cx_Freeze";
  version = "5.1.1";
-  name  = "${pname}-${version}";

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

  src = fetchFromGitHub {
    owner = "explosion";
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -4,11 +4,11 @@
 }:

 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
  version = "1.8.19";

  src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
+    url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz";
    sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
  };

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

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

  disabled = !(isPy27 || pythonAtLeast "3.4");

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

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

  src = fetchFromGitHub {
    owner = "geopandas";
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -8,7 +8,7 @@
 }:

 buildPythonPackage rec {
-  name = "glances-${version}";
+  pname = "glances";
  version = "3.1.1";
  disabled = isPyPy;

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

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

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
  pname = "hmmlearn";
  version = "0.2.2";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+    url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
    sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4";
  };

--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -16,7 +16,7 @@ let components = {
 in
 stdenv.mkDerivation rec {
  version = "2.3.4";
-  name = "hoomd-blue-${version}";
+  pname = "hoomd-blue";

  src = fetchgit {
    url = "https://bitbucket.org/glotzer/hoomd-blue";
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -2,7 +2,7 @@
 , pbr, ldap, prettytable, fixtures, testresources, testtools }:

 buildPythonPackage rec {
-  name = "ldappool-${version}";
+  pname = "ldappool";
  version = "2.4.1";

  src = fetchPypi {
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null
 buildPythonPackage rec {
  pname = "libgpuarray";
  version = "0.7.5";
-  name = pname + "-" + version;

  src = fetchFromGitHub {
    owner = "Theano";
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -8,7 +8,6 @@
 }:

 buildPythonPackage rec {
-  name    = "${pname}-${version}";
  pname   = "libsoundtouch";
  version = "0.4.0";

--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
  pname = "llfuse";
  version = "1.3.6";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
+    url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2";
    sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
  };

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

 buildPythonPackage rec {
-  name = "mps-youtube-${version}";
+  pname = "mps-youtube";
  version = "0.2.7.1";
  disabled = (!isPy3k);

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

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

 stdenv.mkDerivation rec {
-  name = "python-notify-${version}";
+  pname = "python-notify";
  version = "0.1.1";

  src = fetchurl {
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
  pname = "nwdiag";
  version = "1.0.4";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
+    url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
    sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa";
  };

--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
  # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
  # This is not the "released" 3.0.0 just a commit
  version = "3.0.0";
-  name = "ovito-${version}";
+  pname = "ovito";

  src = fetchgit {
    url = "https://gitlab.com/stuko/ovito";
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
  pname = "paramz";
  version = "0.9.5";
-  name  = "${pname}-${version}";

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

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

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -11,11 +11,10 @@
 buildPythonPackage rec {
  version  = "2.7";
  pname = "powerline";
-  name = pname + "-" + version;

  src = fetchurl {
    url    = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
-    name   = "${name}.tar.gz";
+    name   = "${pname}-${version}.tar.gz";
    sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5";
  };

--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "PyGithub";
  version = "1.36";
-  name = pname + "-" + version;

  src = fetchFromGitHub {
    owner = "PyGithub";
--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/pkgs/development/python-modules/pyblock/default.nix
@@ -5,13 +5,13 @@
 }:

 stdenv.mkDerivation rec {
-  name = "pyblock-${version}";
+  pname = "pyblock";
  version = "0.53";
  md5_path = "f6d33a8362dee358517d0a9e2ebdd044";

  src = pkgs.fetchurl rec {
    url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
-        + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+        + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
    sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
  };

--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -5,7 +5,6 @@
 mkDerivation rec {
  pname = "compyte";
  version = "git-20150817";
-  name = pname + "-" + version;

  src = fetchFromGitHub {
    owner = "inducer";
--- a/pkgs/development/python-modules/pyev/default.nix
+++ b/pkgs/development/python-modules/pyev/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
  pname = "pyev";
  version = "0.9.0";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/p/pyev/${name}.tar.gz";
+    url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
    sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
  };

--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -12,11 +12,10 @@ in
 buildPythonPackage rec {
  pname = "pyftgl";
  version = "0.4b";
-  name = pname + "-" + version;

  src = fetchFromGitHub {
    owner = "umlaeute";
-    repo = name;
+    repo = "${pname}-${version}";
    rev = version;
    sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
  };
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
  pname = "pygobject";
  version = "2.28.6";
  format = "other";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
+    url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
    sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
  };

@@ -31,7 +30,7 @@ buildPythonPackage rec {
  # used to select a specific version, in our setup it should have no
  # effect, but we leave it in case somebody expects and calls it.
  postInstall = ''
-    mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
+    mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}

    # Prevent wrapping of codegen files as these are meant to be
    # executed by the python program
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -4,7 +4,6 @@ buildPythonPackage rec {
  pname = "pygtksourceview";
  format = "other";
  version = "2.10.1";
-  name = pname + "-" + version;

  src = fetchurl {
    url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -14,10 +14,10 @@ let
  });
 in stdenv.mkDerivation rec {
  version = "4.14.3";
-  name = "pykde4-${version}";
+  pname = "pykde4";

  src = fetchurl {
-    url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz";
+    url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
    sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
  };

--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -7,9 +7,9 @@

 stdenv.mkDerivation rec {
  version = "4.14.38";
-  name = "kdelibs-${version}";
+  pname = "kdelibs";
  src = fetchurl {
-    url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz";
+    url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
    sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
  };

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

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -5,7 +5,6 @@
 buildPythonPackage rec {
  pname = "pyocr";
  version = "0.5.3";
-  name = pname + "-" + version;
  disabled = !isPy3k;

  # Don't fetch from PYPI because it doesn't contain tests.
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -6,7 +6,7 @@
 }:

 buildPythonPackage rec {
-  name = "pyparted-${version}";
+  pname = "pyparted";
  version = "3.10.7";
  disabled = isPyPy;

--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -2,7 +2,7 @@
 , isPy3k, isPyPy
 }:
 buildPythonPackage rec {
-  name = "pypillowfight-${version}";
+  pname = "pypillowfight";
  version = "0.2.4";

  src = fetchFromGitLab {
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -13,8 +13,6 @@
 }:

 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
  pname = "Pyro4";
  version = "4.75";

--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -3,11 +3,11 @@
 # Should be bumped along with EFL!

 buildPythonPackage rec {
-  name = "python-efl-${version}";
+  pname = "python-efl";
  version = "1.22.0";

  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+    url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
    sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
  };

--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -4,7 +4,6 @@
 buildPythonPackage rec {
  pname = "python-fedora";
  version = "0.10.0";
-  name = pname + "-" + version;

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

    src = fetchPypi {
      inherit pname version;
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -11,7 +11,7 @@
 disabledIf (isPy3k || isPyPy)
  (buildPythonPackage rec {
    # TODO: Qt5 support
-    name = "qscintilla-${version}";
+    pname = "qscintilla";
    version = pkgs.qscintilla.version;
    format = "other";

--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
  pname = "python-recursive-pth-loader";
  version = "1.0";
-  name = pname + "-" + version;

  dontUnpack = true;

--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
  version = "1.2.3";
  pname = "robotframework-ride";
  disabled = isPy3k;
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
+    url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz";
    sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
  };

--- a/pkgs/development/python-modules/rpkg/default.nix
+++ b/pkgs/development/python-modules/rpkg/default.nix
@@ -4,12 +4,11 @@
 buildPythonPackage rec {
  pname = "rpkg";
  version = "1.50";
-  name  = "${pname}-${version}";

  disabled = isPy3k;

  src = fetchurl {
-    url = "https://releases.pagure.org/rpkg/${name}.tar.gz";
+    url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz";
    sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv";
  };

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

 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
  pname = "selectors34";
  version = "1.2";

--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -5,10 +5,9 @@
 buildPythonPackage rec {
  pname = "seqdiag";
  version = "0.9.6";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
+    url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
    sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf";
  };

--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -9,8 +9,6 @@
 }:

 buildPythonPackage rec {
-
-  name = "${pname}-${version}";
  pname = "serpent";
  version = "1.27";

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

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname   = "smugline";
  version = "20160106";

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

 buildPythonPackage rec {
-  name    = pname + "-" + version;
  pname   = "smugpy";
  version = "20131218";

--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -3,10 +3,9 @@
 buildPythonPackage rec {
  pname = "sphfile";
  version = "1.0.1";
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+    url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz";
    sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8";
  };

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

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/sybase/default.nix
+++ b/pkgs/development/python-modules/sybase/default.nix
@@ -8,11 +8,10 @@
 buildPythonPackage rec {
  pname = "python-sybase";
  version = "0.40pre2";
-  name = pname + "-" + version;
  disabled = isPy3k;

  src = fetchurl {
-    url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz";
    sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j";
  };

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

  src = fetchFromGitHub {
    owner = "systemd";
--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -2,7 +2,7 @@

 buildPythonPackage rec {
  version = "0.5.3-2016-09-28";
-  name = "tempita-${version}";
+  pname = "tempita";

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

  format = "wheel";

--- a/pkgs/development/python-modules/umemcache/default.nix
+++ b/pkgs/development/python-modules/umemcache/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
  pname = "umemcache";
  version = "1.6.3";
  disabled = isPy3k;
-  name = pname + "-" + version;

  src = fetchurl {
-    url = "mirror://pypi/u/umemcache/${name}.zip";
+    url = "mirror://pypi/u/umemcache/${pname}-${version}.zip";
    sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
  };

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

 buildPythonPackage rec {
-  name  = "${pname}-${version}";
  pname = "unicorn";
  version = "1.0.1";

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

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

  disabled = isPy3k;

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

  src = fetchurl {
    url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -21,7 +21,6 @@ assert wxGTK.unicode;
 buildPythonPackage rec {
  pname = "wxPython";
  version = "3.0.2.0";
-  name = pname + "-" + version;

  disabled = isPy3k || isPyPy;
  doCheck = false;