Python: add pname attributes to libraries

so that we can use the update script.

95 files changed, 265 insertions, 152 deletions

diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
index 9774433ddc50..21d6e02826c6 100644
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -2,8 +2,9 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  name = "asgi_ipc-${version}";
   version = "1.3.1";
+  pname = "asgi_ipc";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index 5576fc0e68b2..9f2d1226acfa 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,8 +2,9 @@
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  name = "asgi_redis-${version}";
   version = "1.3.0";
+  pname = "asgi_redis";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 1bd3ef19f7e1..7f841fb78f15 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl, six }:
 buildPythonPackage rec {
-  name = "asgiref-${version}";
   version = "1.1.1";
+  pname = "asgiref";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgiref/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index 146f47bd9458..d7b7455b1683 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -1,8 +1,9 @@
 { stdenv, buildPythonPackage, fetchurl,
   m2r, setuptools_scm, six, attrs }:
 buildPythonPackage rec {
-  name = "Automat-${version}";
   version = "0.5.0";
+  pname = "Automat";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/A/Automat/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index 9362729af447..6a8e33dc2ee6 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -1,8 +1,9 @@
 {stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
 
 buildPythonPackage rec {
-  name = "bap";
+  pname = "bap";
   version = "1.1.0";
+  name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
index 8a099983521f..738882b6545a 100644
--- a/pkgs/development/python-modules/bcrypt.nix
+++ b/pkgs/development/python-modules/bcrypt.nix
@@ -4,8 +4,9 @@
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "bcrypt-${version}";
   version = "3.1.2";
+  pname = "bcrypt";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 42a7401b09d6..19acf7b49ef7 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -7,7 +7,8 @@ let
   selinuxWithPython = libselinux.override pyenable;
   cryptsetupWithPython = cryptsetup.override pyenable;
 in buildPythonPackage rec {
-  name = "blivet-${version}";
+  pname = "blivet";
+  name = "${pname}-${version}";
   version = "0.67";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index d27a65375567..7e5255c46ee1 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,8 +1,9 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  name = "breathe-${version}";
   version = "4.2.0";
+  pname = "breathe";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index a589369210da..e99fcdc48021 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -2,7 +2,8 @@
   asgiref, django, daphne
 }:
 buildPythonPackage rec {
-  name = "channels-${version}";
+  pname = "channels";
+  name = "${pname}-${version}";
   version = "1.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 44fbeb6d39f5..50216c7ae1f1 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl
 }:
 buildPythonPackage rec {
-  name = "constantly-${version}";
+  pname = "constantly";
+  name = "${pname}-${version}";
   version = "15.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 34cc597ede95..562b29cf0625 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -2,7 +2,8 @@
   asgiref, autobahn, twisted, hypothesis
 }:
 buildPythonPackage rec {
-  name = "daphne-${version}";
+  pname = "daphne";
+  name = "${pname}-${version}";
   version = "1.2.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index 8e05ee343573..c814b82dad01 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPythonPackage, fetchurl, six }:
 buildPythonPackage rec {
-  name = "dateutil-${version}";
+  pname = "dateutil";
+  name = "${pname}-${version}";
   version = "2.6.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index d2e1d2dc86fd..ab6e70a9a642 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -2,7 +2,9 @@
 , ncurses, pygobject3 }:
 
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
-  name = "dbus-python-1.2.4";
+  pname = "dbus-python";
+  version = "1.2.4";
+  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index d8a314750ca1..22f78533142e 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -2,7 +2,8 @@
   django, django_nose, six
 }:
 buildPythonPackage rec {
-  name = "django-compat-${version}";
+  pname = "django-compat";
+  name = "${pname}-${version}";
   version = "1.0.14";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index e673d587e3e3..3baf5d7648d9 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -3,8 +3,9 @@
   pyparsing, django, celery
 }:
 buildPythonPackage rec {
-  name = "django-raster-${version}";
   version = "0.3.1";
+  pname = "django-raster";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/django-raster/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
index 6cc3af8c2700..52b62e8d8b8b 100644
--- a/pkgs/development/python-modules/django/1_10.nix
+++ b/pkgs/development/python-modules/django/1_10.nix
@@ -3,7 +3,8 @@
   geos, gdal
 }:
 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
+  name = "${pname}-${version}";
   version = "1.10.7";
   disabled = pythonOlder "2.7";
 
diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 01d9992220ff..0845352fba1a 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -3,8 +3,10 @@
   geos, gdal, pytz
 }:
 buildPythonPackage rec {
-  name = "Django-${version}";
+  pname = "Django";
+  name = "${pname}-${version}";
   version = "1.11.1";
+
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix
index aee9707a5231..b6df932e6585 100644
--- a/pkgs/development/python-modules/django_guardian.nix
+++ b/pkgs/development/python-modules/django_guardian.nix
@@ -3,7 +3,8 @@
 , pytest, pytestrunner, pytest-django, setuptools_scm
 }:
 buildPythonPackage rec {
-  name = "django-guardian-${version}";
+  pname = "django-guardian";
+  name = "${pname}-${version}";
   version = "1.4.8";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 5ad026a8255a..c68d9b902ab3 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  name = "djangorestframework-${version}";
   version = "3.5.4";
+  pname = "djangorestframework";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
index 84c7b5ff38b5..3f0243e21141 100644
--- a/pkgs/development/python-modules/docker.nix
+++ b/pkgs/development/python-modules/docker.nix
@@ -3,8 +3,9 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  name = "docker-${version}";
   version = "2.0.2";
+  pname = "docker";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index 9af95f72598f..fb016c04b07c 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -7,7 +7,8 @@
 }:
 buildPythonApplication rec {
   version = "1.10.0";
-  name = "docker-compose-${version}";
+  pname = "docker-compose";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix
index 8698a65ea11b..ba40b0b3f858 100644
--- a/pkgs/development/python-modules/ds4drv.nix
+++ b/pkgs/development/python-modules/ds4drv.nix
@@ -4,7 +4,8 @@
 }:
 
 buildPythonPackage rec {
-  name = "ds4drv-${version}";
+  pname = "ds4drv";
+  name = "${pname}-${version}";
   version = "0.5.1";
 
   # PyPi only carries py3 wheel
diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
index d482aa146279..94367bbec6cb 100644
--- a/pkgs/development/python-modules/dulwich.nix
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -3,8 +3,9 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  name = "dulwich-${version}";
   version = "0.14.1";
+  pname = "dulwich";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index c6c6137a2d4e..1f457235b6a3 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -2,7 +2,8 @@
 
 buildPythonPackage rec {
   version = "0.8.1";
-  name = "ezdxf-${version}";
+  pname = "ezdxf";
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "mozman";
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index 4a10b088d987..d5ce8f8afc2e 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -1,7 +1,9 @@
 { stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }:
 
 buildPythonPackage rec {
-  name = "feedgenerator-1.9";
+  pname = "feedgenerator";
+  version = "1.9";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
index 88b4f811e944..a657c25eed7c 100644
--- a/pkgs/development/python-modules/flake8-blind-except/default.nix
+++ b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "flake8-blind-except-${version}";
+  pname = "flake8-blind-except";
+  name = "${pname}-${version}";
   version = "0.1.1";
   src = fetchurl {
     url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
index b383c5db0083..c00bf0c85512 100644
--- a/pkgs/development/python-modules/flake8-debugger/default.nix
+++ b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage, flake8, nose }:
 
 buildPythonPackage rec {
-  name = "flake8-debugger-${version}";
+  pname = "flake8-debugger";
+  name = "${pname}-${version}";
   version = "1.4.0";
   src = fetchurl {
     url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic.nix
index 9ea9616fbda1..4181d9647876 100644
--- a/pkgs/development/python-modules/flask-elastic.nix
+++ b/pkgs/development/python-modules/flask-elastic.nix
@@ -2,7 +2,8 @@
 , flask, elasticsearch }:
 
 buildPythonPackage rec {
-  name = "Flask-Elastic-${version}";
+  pname = "Flask-Elastic";
+  name = "${pname}-${version}";
   version = "0.2";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login.nix
index 37f9d72dd3f8..cdc7cefff954 100644
--- a/pkgs/development/python-modules/flask-ldap-login.nix
+++ b/pkgs/development/python-modules/flask-ldap-login.nix
@@ -3,7 +3,9 @@
 , mock, nose }:
 
 buildPythonPackage rec {
-  name = "flask-ldap-login-0.3.0";
+  pname = "flask-ldap-login";
+  version = "0.3.0";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix
index 0149e29bcf78..a463964b312d 100644
--- a/pkgs/development/python-modules/flask-login.nix
+++ b/pkgs/development/python-modules/flask-login.nix
@@ -2,7 +2,8 @@
 , flask, nose, mock, blinker}:
 
 buildPythonPackage rec {
-  name = "Flask-Login-${version}";
+  pname = "Flask-Login";
+  name = "${pname}-${version}";
   version = "0.4.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib.nix
index 83413dadb7f8..cacb16cb7bb7 100644
--- a/pkgs/development/python-modules/flask-oauthlib.nix
+++ b/pkgs/development/python-modules/flask-oauthlib.nix
@@ -2,7 +2,8 @@
 , flask, oauthlib, requests_oauthlib, flask_sqlalchemy
 , mock, nose}:
 buildPythonPackage rec {
-  name = "Flask-OAuthlib-${version}";
+  pname = "Flask-OAuthlib";
+  name = "${pname}-${version}";
   version = "0.9.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix
index 24e66ea4e987..a0b623c6b6ab 100644
--- a/pkgs/development/python-modules/flask-wtf.nix
+++ b/pkgs/development/python-modules/flask-wtf.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }:
 
 buildPythonPackage rec {
-  name = "Flask-WTF-0.14.2";
+  pname = "Flask-WTF";
+  version = "0.14.2";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix
index 1f14b661d53e..5dfd399ac7de 100644
--- a/pkgs/development/python-modules/ghdiff.nix
+++ b/pkgs/development/python-modules/ghdiff.nix
@@ -2,7 +2,9 @@
 , zope_testrunner, six, chardet}:
 
 buildPythonPackage rec {
-  name = "ghdiff-0.4";
+  pname = "ghdiff";
+  version = "0.4";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/g/ghdiff/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn.nix
index 026e9df360ce..c67bccc44c02 100644
--- a/pkgs/development/python-modules/gunicorn.nix
+++ b/pkgs/development/python-modules/gunicorn.nix
@@ -2,7 +2,9 @@
 , pytest, mock, pytestcov, coverage }:
 
 buildPythonPackage rec {
-  name = "gunicorn-19.3.0";
+  pname = "gunicorn";
+  version = "19.3.0";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index e2cb11cedb41..ece895696672 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -11,8 +11,9 @@ let
   mpiSupport = hdf5.mpiSupport;
 
 in buildPythonPackage rec {
-  name = "h5py-${version}";
   version = "2.6.0";
+  pname = "h5py";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/h/h5py/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
index e79cdede092e..9e97e56c1341 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -1,8 +1,9 @@
 { stdenv , fetchurl , buildPythonPackage , sphinx }:
 
 buildPythonPackage rec {
+  pname = "hieroglyph";
   version = "0.7.1";
-  name = "hieroglyph-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index d5251f1fa55a..29829c918921 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -9,8 +9,9 @@ buildPythonPackage rec {
   # pytz fake_factory django numpy pytest
   # If you need these, you can just add them to your environment.
 
-  name = "hypothesis-${version}";
   version = "3.7.0";
+  pname = "hypothesis";
+  name = "${pname}-${version}";
 
   # Upstream prefers github tarballs
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot.nix
index efbd4b981fa5..9161f3f6f0b8 100644
--- a/pkgs/development/python-modules/jabberbot.nix
+++ b/pkgs/development/python-modules/jabberbot.nix
@@ -1,7 +1,9 @@
 { stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }:
 
 buildPythonPackage rec {
-  name = "jabberbot-0.16";
+  pname = "jabberbot";
+  version = "0.16";
+  name = "${pname}-${version}";
 
   disabled = isPy3k;
   src = fetchurl {
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index fa4ba7bffb5d..c199b2f50dbd 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }:
 
 buildPythonApplication rec {
-    name = "jsbeautifier-1.6.14";
+  pname = "jsbeautifier";
+  version = "1.6.14";
+  name = "jsbeautifier-1.6.14";
 
-    propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [ six ];
 
-    buildInputs = [ EditorConfig pytest ];
+  buildInputs = [ EditorConfig pytest ];
 
-    src = fetchurl {
-      url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
-      sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
-    };
+  src = fetchurl {
+    url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
+    sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
+  };
 
-    meta = with stdenv.lib; {
-      homepage    = "http://jsbeautifier.org";
-      description = "JavaScript unobfuscator and beautifier.";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ apeyroux ];
-    };
-  }
+  meta = with stdenv.lib; {
+    homepage    = "http://jsbeautifier.org";
+    description = "JavaScript unobfuscator and beautifier.";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ apeyroux ];
+  };
+}
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index 28b5e11223ff..d43e56781a7b 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, buildPythonPackage, pycurl }:
 
 buildPythonPackage rec {
-  name = "koji-1.8";
+  pname = "koji";
+  version = "1.8";
+  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index 95243f52a38a..b84b20f630f8 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -2,7 +2,9 @@
 , openldap, cyrus_sasl, openssl }:
 
 buildPythonPackage rec {
-  name = "ldap-2.4.22";
+  pname = "python-ldap";
+  version = "2.4.22";
+  name = "${pname}-${version}";
   disabled = isPy3k;
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix
index 85b5d92e79f4..5d8c886e00bd 100644
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/pkgs/development/python-modules/libais/default.nix
@@ -2,7 +2,8 @@
   six, pytest, pytestrunner, pytestcov, coverage
 }:
 buildPythonPackage rec {
-  name = "libais-${version}";
+  pname = "libais";
+  name = "${pname}-${version}";
   version = "0.16";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index cae6ac62e1e6..bfe3b7bbb667 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -5,7 +5,8 @@ then throw "libArcus not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  name = "libarcus-${version}";
+  pname = "libarcus";
+  name = "${pname}-${version}";
   version = "2.4.0";
   
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix
index 63bcad285c4e..b27dbc2935af 100644
--- a/pkgs/development/python-modules/libasyncns/default.nix
+++ b/pkgs/development/python-modules/libasyncns/default.nix
@@ -2,7 +2,8 @@
 , libasyncns, pkgconfig }:
 
 buildPythonPackage rec {
-  name = "libasyncns-python-${version}";
+  pname = "libasyncns-python";
+  name = "${pname}-${version}";
   version = "0.7.1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index 79eb8ab2f83c..69d9dde6cbac 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
 
 buildPythonPackage rec {
-  name = "libsexy-${version}";
+  pname = "libsexy";
+  name = "${pname}-${version}";
   version = "0.1.9";
   format = "other";
 
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 49f1e2da5ba4..5a67d6a719b3 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl,
   mistune, docutils } :
 buildPythonPackage rec {
-  name = "m2r-${version}";
+  pname = "m2r";
+  name = "${pname}-${version}";
   version = "0.1.5";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix
index af7511bc9aa3..e5c22bc4dc6c 100644
--- a/pkgs/development/python-modules/markdown2.nix
+++ b/pkgs/development/python-modules/markdown2.nix
@@ -1,8 +1,9 @@
 { stdenv, buildPythonPackage, fetchurl }:
 
 buildPythonPackage rec {
-  name = "markdown2-${version}";
+  pname = "markdown2";
   version = "2.3.1";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/m/markdown2/${name}.zip";
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index b917575e2390..c2841d3c7e49 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -20,8 +20,9 @@ assert enableTk -> (tcl != null)
 assert enableQt -> pyqt4 != null;
 
 buildPythonPackage rec {
-  name = "matplotlib-${version}";
   version = "2.0.0";
+  pname = "matplotlib";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index c38d948dd6be..55e340f2b23f 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
 
 buildPythonPackage rec {
-  name = "mpi4py-1.3.1";
+  pname = "mpi4py";
+  version = "1.3.1";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix
index 979a741e1ab3..b50bcae033c6 100644
--- a/pkgs/development/python-modules/netcdf4.nix
+++ b/pkgs/development/python-modules/netcdf4.nix
@@ -2,7 +2,8 @@
 , numpy, zlib, netcdf, hdf5, curl, libjpeg
 }:
 buildPythonPackage rec {
-  name = "netCDF4-${version}";
+  pname = "netCDF4";
+  name = "${pname}-${version}";
   version = "1.2.7";
 
   disabled = isPyPy;
diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix
index c436e40d2382..92e2f0fc0ca3 100644
--- a/pkgs/development/python-modules/nltk.nix
+++ b/pkgs/development/python-modules/nltk.nix
@@ -1,8 +1,9 @@
 { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
 
 buildPythonPackage rec {
-  name = "nltk-${version}";
   version = "3.2.2";
+  pname = "nltk";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 3ce40f2618a2..6621db9260d0 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -15,7 +15,8 @@
 
 buildPythonPackage rec {
   version = "0.31.0";
-  name = "numba-${version}";
+  pname = "numba";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix
index 3dbf54102e90..b59c54c685d8 100644
--- a/pkgs/development/python-modules/os-testr/default.nix
+++ b/pkgs/development/python-modules/os-testr/default.nix
@@ -3,8 +3,9 @@
   coverage, oslosphinx, oslotest, testscenarios, six, ddt 
 }:
 buildPythonPackage rec {
-  name = "os-testr-${version}";
   version = "0.8.1";
+  pname = "os-testr";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/o/os-testr/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 72901881b039..b54bcc0ed1d5 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -5,7 +5,8 @@
 , blinker, pillow, beautifulsoup4, markupsafe }:
 
 buildPythonPackage rec {
-  name = "pelican-${version}";
+  pname = "pelican";
+  name = "${pname}-${version}";
   version = "3.7.1";
   disabled = isPy26;
 
diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix
index 1cd0e4afc0ce..9f61619e12bc 100644
--- a/pkgs/development/python-modules/pep257.nix
+++ b/pkgs/development/python-modules/pep257.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPythonPackage, fetchurl, pytest, mock }:
 buildPythonPackage rec {
-  name = "pep257-${version}";
+  pname = "pep257";
+  name = "${pname}-${version}";
   version = "0.7.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index ead0e3d858d6..34244d63210f 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "phonenumbers-8.4.0";
+  pname = "phonenumbers";
+  version = "8.4.0";
+  name = "${pname}-${version}";
 
   meta = {
     description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 012c8c42d6ab..d96a4c8cea32 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:
 
 stdenv.mkDerivation rec {
+  pname = "pyatspi";
   version = "2.18.0";
-  name = "pyatspi-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz";
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 2919506e9316..c1ca9d4c02cf 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -9,8 +9,9 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl
   patch_waf-py3_5 = ./waf-py3_5.patch;
 
 in buildPythonPackage rec {
+  pname = "pycairo";
   version = "1.10.0";
-  name = "pycairo-${version}";
+  name = "${pname}-${version}";
   format = "other";
 
   src = if isPy3k
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index d465c0befe1d..6d719075b900 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -2,7 +2,8 @@
 
 buildPythonPackage rec {
   version = "3.4.3";
-  name = "pycryptodome-${version}";
+  pname = "pycryptodome";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix
index 1bdf61904eb2..5d11b716a2f8 100644
--- a/pkgs/development/python-modules/pyexiv2/default.nix
+++ b/pkgs/development/python-modules/pyexiv2/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, python, exiv2, scons, boost }:
 
-let version = "0.3.2"; in
-
 stdenv.mkDerivation rec {
-  name = "pyexiv2-${version}";
+  pname = "pyexiv2";
+  version = "0.3.2";
+  name = "${pname}-${version}";
   
   src = fetchurl {
     url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2";
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index af7b7aca93cb..a10c858c2336 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -3,7 +3,8 @@
 }:
 
 buildPythonPackage rec {
-  name = "pygame-${version}";
+  pname = "pygame";
+  name = "${pname}-${version}";
   version = "1.9.3";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index c91930292c2e..157c65d12791 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,7 +1,8 @@
 { buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }:
 buildPythonPackage rec {
-  name = "pylibmc-${version}";
   version = "1.5.1";
+  pname = "pylibmc";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix
index 87c0c3db264f..7857f46e2422 100644
--- a/pkgs/development/python-modules/pyrax.nix
+++ b/pkgs/development/python-modules/pyrax.nix
@@ -1,7 +1,9 @@
 { lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
   rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
 buildPythonPackage rec {
-  name = "pyrax-1.9.8";
+  pname = "pyrax";
+  version = "1.9.8";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyrax/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 1b47b7f3f7df..b2d66999a860 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -1,7 +1,9 @@
 {stdenv, buildPythonPackage, fetchurl}:
 
 buildPythonPackage rec {
-  name = "pyroute2-0.4.13";
+  pname = "pyroute2";
+  version = "0.4.13";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index bb2291fb4ac3..7034d285a453 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
 
 buildPythonPackage rec {
-  name = "pyscard-${version}";
   version = "1.9.4";
+  pname = "pyscard";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyscard/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 009afdd3a030..9d7f11b939dd 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -2,7 +2,8 @@
 
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 buildPythonPackage rec {
-  name = "pyside-${version}";
+  pname = "pyside";
+  name = "${pname}-${version}";
   version = "1.2.4";
   format = "other";
 
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 076838425a42..147e9773fbf7 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -6,7 +6,8 @@
 }:
 
 buildPythonApplication rec {
-  name = "pysrt-${version}";
+  pname = "pysrt";
+  name = "${pname}-${version}";
   version = "1.1.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 56fc72ebccee..0fd485684464 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -3,7 +3,8 @@
 , fetchpatch
 }:
 buildPythonPackage rec {
-  name = "pytest-django-${version}";
+  pname = "pytest-django";
+  name = "${pname}-${version}";
   version = "3.1.2";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 34a2bf7e31cb..6f6f79109d9b 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -10,7 +10,8 @@
 }:
 
 buildPythonPackage rec {
-  name = "pytest-httpbin-${version}";
+  pname = "pytest-httpbin";
+  name = "${pname}-${version}";
   version = "0.2.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257.nix
index 7ce63ebc7a6d..1509d80feb1a 100644
--- a/pkgs/development/python-modules/pytest-pep257.nix
+++ b/pkgs/development/python-modules/pytest-pep257.nix
@@ -1,19 +1,21 @@
 { stdenv, buildPythonPackage, fetchurl, pytest, pep257 }:
+
 buildPythonPackage rec {
-   name = "pytest-pep257-${version}";
-   version = "0.0.5";
+  pname = "pytest-pep257";
+  name = "${pname}-${version}";
+  version = "0.0.5";
 
-   src = fetchurl {
-     url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
-     sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w";
-   };
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
+    sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w";
+  };
 
-   buildInputs = [ pytest ];
-   propagatedBuildInputs = [ pep257 ];
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ pep257 ];
 
-   meta = with stdenv.lib; {
-     homepage = https://github.com/anderslime/pytest-pep257;
-     description = "py.test plugin for PEP257";
-     license = licenses.mit;
-   };
+  meta = with stdenv.lib; {
+    homepage = https://github.com/anderslime/pytest-pep257;
+    description = "py.test plugin for PEP257";
+    license = licenses.mit;
+  };
 }
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 90b67022c5b1..402c869c98c9 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
 buildPythonPackage rec {
-  name = "pytest-${version}";
   version = "3.0.7";
+  pname = "pytest";
+  name = "${pname}-${version}";
 
   preCheck = ''
     # don't test bash builtins
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index da4dd4107461..c1472bc66a8e 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -3,7 +3,8 @@
 }:
 
 buildPythonPackage rec {
-  name = "python-jose-${version}";
+  pname = "python-jose";
+  name = "${pname}-${version}";
   version = "1.3.2";
   src = fetchFromGitHub {
     owner = "mpdavis";
diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
index 30f734d57193..91b084cb14c7 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "python-sql-${version}";
+  pname = "python-sql";
+  name = "${pname}-${version}";
   version = "0.8";
   src = fetchurl {
     url = "mirror://pypi/p/python-sql/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index fe85b7bb0d34..8c5732049c7b 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -1,8 +1,9 @@
 { lib, fetchurl, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
-  name = "python-stdnum-${version}";
   version = "1.5";
+  pname = "python-stdnum";
+  name = "${pname}-${version}";
   # Failing tests and dependency issue on Py3k
   disabled = isPy3k;
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix
index e9a3ecaac5b3..70950e4e9273 100644
--- a/pkgs/development/python-modules/pyudev.nix
+++ b/pkgs/development/python-modules/pyudev.nix
@@ -3,7 +3,8 @@
 }:
 
 buildPythonPackage rec {
-  name = "pyudev-${version}";
+  pname = "pyudev";
+  name = "${pname}-${version}";
   version = "0.21.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
index 27925a619f2f..a69c8568aca6 100644
--- a/pkgs/development/python-modules/pywebdav/default.nix
+++ b/pkgs/development/python-modules/pywebdav/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
-  name = "PyWebDAV-${version}";
+  pname = "pywebdav";
+  name = "${pname}-${version}";
   version = "0.9.8";
   disabled = isPy3k;
   src = fetchurl {
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index b85b20423697..0ef91fda9e35 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -1,7 +1,9 @@
 {lib, fetchurl, python, buildPythonPackage, makeWrapper}:
 
 buildPythonPackage rec {
-  name = "PyXML-0.8.4";
+  pname = "PyXML";
+  version = "0.8.4";
+  name = "${pname}-${pname}";
   format = "other";
   src = fetchurl {
     url = "mirror://sourceforge/pyxml/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 7231da9d3d07..183e5a2f1d93 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -1,7 +1,8 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, unrar, glibcLocales }:
 
 buildPythonPackage rec {
-  name = "rarfile-${version}";
+  pname = "rarfile";
+  name = "${pname}-${version}";
   version = "3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index 4f2c3da8936e..dc42449a3398 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage, genshi, lxml }:
 
 buildPythonPackage rec {
-  name = "relatorio-${version}";
+  pname = "relatorio";
+  name = "${pname}-${version}";
   version = "0.6.4";
   src = fetchurl {
     url = "mirror://pypi/r/relatorio/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index 62ecf134b49e..8d5031757244 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -3,7 +3,8 @@
 
 buildPythonPackage rec {
   version = "0.7.0";
-  name = "requests-oauthlib-${version}";
+  pname = "requests-oauthlib";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index 7ba1c79cd054..d502ad75566c 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,16 +1,18 @@
 {stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}:
 
-stdenv.mkDerivation {
-  name = "rhpl-0.218";
-  
+stdenv.mkDerivation rec {
+  pname = "rhpl";
+  version = "0.218";
+  name = "${pname}-${version}";
+
   src = fetchurl {
     url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm;
     sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16";
   };
-  
+
   inherit python;
-  
+
   builder = ./builder.sh;
-  
+
   buildInputs = [ rpmextract python wirelesstools gettext ];
 }
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 8f3b2ef74b21..72c3308421f8 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -2,8 +2,9 @@
   testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
   service-identity, parsel, pydispatcher, cssselect, lib }:
 buildPythonPackage rec {
-    name = "Scrapy-${version}";
     version = "1.3.1";
+    pname = "Scrapy";
+    name = "${pname}-${version}";
 
     buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
     propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index cd77f66b56eb..78dc82bc7704 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "simpleeval-${version}";
+  pname = "simpleeval";
+  name = "${pname}-${version}";
   version = "0.9.5";
   src = fetchurl {
     url = "mirror://pypi/s/simpleeval/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 76652954cf08..b6094f37c3a5 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,7 +1,9 @@
 { lib, fetchurl, buildPythonPackage, python, isPyPy }:
 
 if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
-  name = "sip-4.19.1";
+  pname = "sip";
+  version = "4.19.1";
+  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index be6f86dae545..6754089ffce8 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, buildPythonPackage, tornado }:
 
 buildPythonPackage rec {
-  name = "snakeviz-${version}";
+  pname = "snakeviz";
+  name = "${pname}-${version}";
   version = "0.4.1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 11ed3a8d6733..9cf1ba1b3d87 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -3,7 +3,8 @@
   pbr, tempita, decorator, sqlalchemy, six, sqlparse 
 }:
 buildPythonPackage rec {
-  name = "sqlalchemy-migrate-${version}";
+  pname = "sqlalchemy-migrate";
+  name = "${pname}-${version}";
   version = "0.11.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index 50a425132a26..cd7bb2b9507b 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -1,7 +1,8 @@
 {stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}:
 
 buildPythonPackage rec {
-  name = "PyStringTemplate-${version}";
+  pname = "PyStringTemplate";
+  name = "${pname}-${version}";
   version = "3.2b1";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 545916858d4a..0788ddaeec62 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -19,7 +19,8 @@
 }:
 
 buildPythonApplication rec {
-  name = "subliminal-${version}";
+  pname = "subliminal";
+  name = "${pname}-${version}";
   version = "2.0.5";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 7faad8ec4f46..c35369747dd9 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -3,7 +3,8 @@
 
 buildPythonPackage rec {
   version = "3.3.0";
-  name = "tables-${version}";
+  pname = "tables";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/t/tables/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
index f3e7bb7025bc..37828752ffe7 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -1,6 +1,8 @@
 { stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }:
 buildPythonPackage rec {
-  name = "twill-0.9.1";
+  pname = "twill";
+  version = "0.9.1";
+  name = "${pname}-${version}";
 
   disabled = isPy3k;
 
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 0cfb00c48b86..6898863e8afc 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -2,8 +2,8 @@
   zope_interface, incremental, automat, constantly
 }:
 buildPythonPackage rec {
-
-  name = "Twisted-${version}";
+  pname = "Twisted";
+  name = "${pname}-${version}";
   version = "17.1.0";
 
   src = fetchurl {
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index bce88635d3c5..066230d0a1fc 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -5,8 +5,9 @@ then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  name = "uranium-${version}";
   version = "2.4.0";
+  pname = "uranium";
+  name = "${pname}-${version}";
   
   src = fetchFromGitHub {
     owner = "Ultimaker";
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 4c343985c597..8c980cf2b2cf 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -1,32 +1,33 @@
 { fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }:
-pythonPackages.buildPythonPackage rec {
-    name = "vowpalwabbit-${version}";
-    version = "8.3.2";
 
-    src = fetchurl{
-      url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
-      sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";
-    };
-    # vw tries to write some explicit things to home
-    # python installed: The directory '/homeless-shelter/.cache/pip/http'
-    preInstall = ''
-      export HOME=$PWD
-    '';
+pythonPackages.buildPythonPackage rec {
+  pname = "vowpalwabbit";
+  name = "${pname}-${version}";
+  version = "8.3.2";
 
-    buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
-    propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
+  src = fetchurl{
+    url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
+    sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";
+  };
+  # vw tries to write some explicit things to home
+  # python installed: The directory '/homeless-shelter/.cache/pip/http'
+  preInstall = ''
+    export HOME=$PWD
+  '';
 
-    checkPhase = ''
-      # check-manifest requires a git clone, not a tarball
-      # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
-      python setup.py check -mrs
-    '';
+  buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
+  propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
 
-    meta = with lib; {
-      description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
-      homepage    = https://github.com/JohnLangford/vowpal_wabbit;
-      license     = licenses.bsd3;
-      maintainers = with maintainers; [ teh ];
-    };
+  checkPhase = ''
+    # check-manifest requires a git clone, not a tarball
+    # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
+    python setup.py check -mrs
+  '';
 
+  meta = with lib; {
+    description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
+    homepage    = https://github.com/JohnLangford/vowpal_wabbit;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ teh ];
+  };
 }
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 332feef9e497..33adac52c903 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPythonPackage, fetchurl, isPy3k }:
 buildPythonPackage rec {
-  name = "xmpp.py-${version}";
+  pname = "xmpp.py";
+  name = "${pname}-${version}";
   version = "0.5.0rc1";
 
   patches = [ ./ssl.patch ];
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index 33e9cfeab3a9..f6bbb8f4b86c 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -3,7 +3,8 @@
 with lib;
 
 buildPythonApplication rec {
-  name = "yolk-${version}";
+  pname = "yolk";
+  name = "${pname}-${version}";
   version = "0.4.3";
 
   src = fetchurl {