Merge branch 'master' into closure-size

25 files changed, 66 insertions, 282 deletions

diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 0b7069ab67d5..240fe6388348 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -36,7 +36,7 @@ in buildPythonPackage rec {
     six
   ];
 
-  # Tests are in <nixpkgs/nixos/tests/blivet.nix>.
+  # Tests are in nixos/tests/blivet.nix.
   doCheck = false;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
deleted file mode 100644
index bd5b953f048a..000000000000
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, python, db}:
-
-stdenv.mkDerivation rec {
-  name = "bsddb3-6.1.0";
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
-    sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi";
-  };
-  buildInputs = [python];
-  buildPhase = "true";
-  installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db}";
-}
diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch
new file mode 100644
index 000000000000..7757691bfca1
--- /dev/null
+++ b/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch
@@ -0,0 +1,24 @@
+diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
+--- a/django/contrib/gis/gdal/libgdal.py
++++ b/django/contrib/gis/gdal/libgdal.py
+@@ -17,7 +17,7 @@ try:
+     lib_path = settings.GDAL_LIBRARY_PATH
+ except (AttributeError, EnvironmentError,
+         ImportError, ImproperlyConfigured):
+-    lib_path = None
++    lib_path = "@gdal@/lib/libgdal.so"
+ 
+ if lib_path:
+     lib_names = None
+diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
+--- a/django/contrib/gis/geos/libgeos.py
++++ b/django/contrib/gis/geos/libgeos.py
+@@ -23,7 +23,7 @@ try:
+     lib_path = settings.GEOS_LIBRARY_PATH
+ except (AttributeError, EnvironmentError,
+         ImportError, ImproperlyConfigured):
+-    lib_path = None
++    lib_path = "@geos@/lib/libgeos_c.so"
+ 
+ # Setting the appropriate names for the GEOS-C library.
+ if lib_path:
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
deleted file mode 100644
index a07eceb45aad..000000000000
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, openssl }:
-
-buildPythonPackage rec {
-  name = "ecdsa-0.11";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz";
-    sha256 = "134mbq5xsvx54k9xm7zrizvh9imxmcz1w9mhyfr99p4i7wcnqfwf";
-  };
-
-  buildInputs = [ openssl ];
-
-  meta = {
-    homepage = "http://github.com/warner/python-ecdsa";
-    description = "Pure-python ECDSA signature/verification";
-    license = stdenv.lib.licenses.mit;
-  };
-}
diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix
deleted file mode 100644
index 38ae5949229f..000000000000
--- a/pkgs/development/python-modules/irclib/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ buildPythonPackage, fetchurl }:
-
-buildPythonPackage rec {
-  name = "irclib-${version}";
-  version = "0.4.8";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
-    sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
-  };
-
-  patches = [(fetchurl {
-    url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
-    name = "irclib.py.diff";
-    sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
-  })];
-
-  patchFlags = "irclib.py";
-
-  meta = {
-    description = "Python IRC library";
-  };
-}
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
deleted file mode 100644
index a901ce774c56..000000000000
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages }:
-
-buildPythonPackage rec {
-  name = "mygpoclient-1.7";
-
-  src = fetchurl {
-    url = "https://thp.io/2010/mygpoclient/${name}.tar.gz";
-    sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e";
-  };
-
-  buildInputs = with pythonPackages; [ nose minimock ];
-
-  checkPhase = ''
-    nosetests
-  '';
-
-  meta = {
-    description = "A gpodder.net client library";
-    longDescription = ''
-      The mygpoclient library allows developers to utilize a Pythonic interface
-      to the gpodder.net web services.
-    '';
-    homepage = "https://thp.io/2010/mygpoclient/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.skeidel ];
-  };
-}
diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix
deleted file mode 100644
index 0d6d5b0ffed6..000000000000
--- a/pkgs/development/python-modules/numeric/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ fetchurl, stdenv, python }:
-
-let version = "24.2"; in
-  stdenv.mkDerivation {
-    name = "python-numeric-${version}";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/numpy/Numeric-${version}.tar.gz";
-      sha256 = "0n2jy47n3d121pky4a3r0zjmk2vk66czr2x3y9179xbgxclyfwjz";
-    };
-
-    buildInputs = [ python ];
-
-    buildPhase   = ''python setup.py build --build-base "$out"'';
-    installPhase = ''
-      python setup.py install --prefix "$out"
-
-      # Remove the `lib.linux-i686-2.5' and `temp.linux-i686-2.5' (or
-      # similar) directories.
-      rm -rf $out/lib.* $out/temp.*
-    '';
-
-    # FIXME: Run the tests.
-
-    meta = {
-      description = "A Python module for high-performance, numeric computing";
-
-      longDescription = ''
-        Numeric is a Python module for high-performance, numeric
-        computing.  It provides much of the functionality and
-        performance of commercial numeric software such as Matlab; it
-        some cases, it provides more functionality than commercial
-        software.
-      '';
-
-      license = "Python+LLNL";
-
-      homepage = http://people.csail.mit.edu/jrennie/python/numeric/;
-    };
-  }
diff --git a/pkgs/development/python-modules/psyco/default.nix b/pkgs/development/python-modules/psyco/default.nix
deleted file mode 100644
index 1bdade67d68c..000000000000
--- a/pkgs/development/python-modules/psyco/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, python}:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "psyco-1.5.2";
-  src = fetchurl {
-    url = mirror://sourceforge/psyco/psyco-1.5.2-src.tar.gz;
-    md5 = "bceb17423d06b573dc7b875d34e79417";
-  };
-  buildInputs = [python];
-  buildPhase = "true";
-  installPhase = "python ./setup.py install --prefix=$out";
-}
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index ddaa7eb508e9..07a8e05730b7 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -2,7 +2,7 @@
 
 if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
   version = "1.10.0";
-  name = "pycairo-${version}";
+  name = "${python.libPrefix}-pycairo-${version}";
   src = if python.is_py3k or false
     then fetchurl {
       url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 68a56dedc3a5..f8ca06eec86d 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
-, sqlite, python3, cython3
+, sqlite, python, cython
 }:
 
 stdenv.mkDerivation rec {
-  name = "pycangjie-${version}";
+  name = "${python.libPrefix}-pycangjie-${version}";
   version = "1.3_rev_${rev}";
   rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3
+    autoconf automake libtool pkgconfig libcangjie sqlite python cython
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
deleted file mode 100644
index 766dcaa58f79..000000000000
--- a/pkgs/development/python-modules/pycups/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, python, cups }:
-
-let version = "1.9.68"; in
-
-stdenv.mkDerivation {
-  name = "pycups-${version}";
-  
-  src = fetchurl {
-    url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
-    sha256 = "1i1ph9k1wampa7r6mgc30a99w0zjmxhvcxjxrgjqa5vdknynqd24";
-  };
-
-  installPhase = ''
-    CFLAGS=-DVERSION=\\\"${version}\\\" python ./setup.py install --prefix $out
-  '';
-  
-  buildInputs = [ python cups ];
-}
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 3a24767ae4ee..321a0b49b089 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11
-, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k,
 }:
 
 buildPythonPackage {
@@ -15,6 +15,9 @@ buildPythonPackage {
     smpeg portmidi libX11
   ];
 
+  # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found
+  disabled = isPy3k;
+
   patches = [ ./pygame-v4l.patch ];
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 14b7bd34eae0..b8082890299b 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
 
 stdenv.mkDerivation rec {
-  name = "pygobject-3.12.1";
+  name = "pygobject-3.18.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/3.12/${name}.tar.xz";
-    sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys";
+    url = "mirror://gnome/sources/pygobject/3.18/${name}.tar.xz";
+    sha256 = "0prc3ky7g50ixmfxbc7zf43fw6in4hw2q07667hp8swi2wassg1a";
   };
 
   buildInputs = [ python pkgconfig glib gobjectIntrospection ];
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 7f4584f9c73e..09890e8694f7 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, astroid, buildPythonPackage }:
 
-pythonPackages.buildPythonPackage rec {
+buildPythonPackage rec {
   name = "pylint-1.4.1";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "0c7hw1pcp5sqmc0v86zygw21isfgzbsqdmlb1sywncnlxmh30f1y";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ astroid ];
+  propagatedBuildInputs = [ astroid ];
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 92b74c952fac..31294c8dc98d 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -3,7 +3,7 @@
 let version = "4.11.3";
 in
 stdenv.mkDerivation {
-  name = "PyQt-x11-gpl-${version}";
+  name = "${python.libPrefix}-PyQt-x11-gpl-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz";
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index b89052602d9a..bb1d91b3ca83 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -3,7 +3,7 @@
 let
   version = "5.4.2";
 in stdenv.mkDerivation {
-  name = "PyQt-${version}";
+  name = "${python.libPrefix}-PyQt-${version}";
 
   meta = with stdenv.lib; {
     description = "Python bindings for Qt5";
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index e3bcf059c1c2..c7e0cc09f14b 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }:
 
 stdenv.mkDerivation {
-  name = "pyside-apiextractor-0.10.10";
+  name = "${python.libPrefix}-pyside-apiextractor-0.10.10";
 
   src = fetchurl {
     url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ];
+  buildInputs = [ cmake libxml2 libxslt sphinx qt4 ];
 
   meta = {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index d274283594ab..fc009a208b70 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }:
+{ stdenv, fetchurl, cmake, python, pysideGeneratorrunner, pysideShiboken, qt4 }:
 
-stdenv.mkDerivation {
-  name = "pyside-1.2.2";
+stdenv.mkDerivation rec {
+  name = "${python.libPrefix}-pyside-${version}";
+  version = "1.2.4";
 
   src = fetchurl {
-    url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2";
-    sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1";
+    url = "https://github.com/PySide/PySide/archive/${version}.tar.gz";
+    sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 2423cbb0c2e4..b576b29dae7b 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }:
+{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }:
 
 stdenv.mkDerivation {
-  name = "pyside-generatorrunner-0.6.16";
+  name = "${python.libPrefix}-pyside-generatorrunner-0.6.16";
 
   src = fetchurl {
     url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ];
+  buildInputs = [ cmake pysideApiextractor sphinx qt4 ];
 
   meta = {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 5e266aba7d0d..549b6275a8ce 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
 
-stdenv.mkDerivation {
-  name = "pyside-shiboken-1.2.2";
+# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
+if isPy35 then throw "shiboken not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
+  name = "${python.libPrefix}-pyside-shiboken-${version}";
+  version = "1.2.4";
 
   src = fetchurl {
-    url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2";
-    sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn";
+    url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz";
+    sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ];
+  buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
 
   preConfigure = ''
     echo "preConfigure: Fixing shiboken_generator install target."
@@ -18,6 +20,8 @@ stdenv.mkDerivation {
       \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
   '';
 
+  cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
+
   meta = {
     description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index b5ddec09c03e..facbccdce355 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }:
+{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }:
 
 stdenv.mkDerivation {
-  name = "pyside-tools-0.2.15";
+  name = "${python.libPrefix}-pyside-tools-0.2.15";
 
   src = fetchurl {
     url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pyside python27 qt4 pysideShiboken ];
+  buildInputs = [ cmake pyside python qt4 pysideShiboken ];
 
   meta = {
     description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix
deleted file mode 100644
index cc36680fcb01..000000000000
--- a/pkgs/development/python-modules/pyx/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{stdenv, fetchurl, python, makeWrapper}:
-
-stdenv.mkDerivation rec {
-  name = "PyX-0.10";
-  src = fetchurl {
-    url = "mirror://sourceforge/pyx/${name}.tar.gz";
-    sha256 = "dfaa4a7790661d67d95f80b22044fdd8a9922483631950296ff1d7a9f85c8bba";
-  };
-
-  patchPhase = ''
-    substituteInPlace ./setup.py --replace '"/etc"' '"etc"'
-  '';
-
-  buildInputs = [python makeWrapper];
-  buildPhase = "python ./setup.py build";
-  installPhase = ''
-    python ./setup.py install --prefix="$out" || exit 1
-
-    for i in "$out/bin/"*
-    do
-      # FIXME: We're assuming Python 2.4.
-      wrapProgram "$i" --prefix PYTHONPATH :  \
-       "$out/lib/python2.4/site-packages" ||  \
-        exit 2
-    done
-  '';
-
-  meta = {
-    description = ''Python graphics package'';
-    longDescription = ''
-      PyX is a Python package for the creation of PostScript and PDF
-      files. It combines an abstraction of the PostScript drawing
-      model with a TeX/LaTeX interface. Complex tasks like 2d and 3d
-      plots in publication-ready quality are built out of these
-      primitives.
-    '';
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://pyx.sourceforge.net/;
-  };
-}
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
deleted file mode 100644
index b63750815513..000000000000
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pythonPackages, python }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "rbtools-0.7.2";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz";
-    sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i";
-  };
-
-  propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ];
-
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
-  };
-}
diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix
deleted file mode 100644
index e45ffdfb2e17..000000000000
--- a/pkgs/development/python-modules/slowaes/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage }:
-
-buildPythonPackage rec {
-  name = "slowaes-0.1a1";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz";
-    sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09";
-  };
-
-  meta = {
-    homepage = "http://code.google.com/p/slowaes/";
-    description = "AES implemented in pure python";
-    license = stdenv.lib.licenses.asl20;
-  };
-}
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
deleted file mode 100644
index b1500b01972f..000000000000
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ buildPythonPackage, fetchurl, setuptools }:
-
-buildPythonPackage rec {
-  name = "xmpp.py-${version}";
-  version = "0.5.0rc1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
-    sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
-  };
-
-  buildInputs = [ setuptools ];
-
-  preInstall = ''
-    mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
-    export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
-  '';
-
-  meta = {
-    description = "XMPP python library";
-  };
-}