From 39b8e3808daabe9ac2fd6889bfa6866fc0cd942c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 8 Dec 2015 17:20:25 +0100
Subject: [PATCH 01/31] python numeric: remove package

numeric was superseded by numpy about 10 years ago. I think we can
remove it...
---
 .../python-modules/numeric/default.nix        | 40 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 41 deletions(-)
 delete mode 100644 pkgs/development/python-modules/numeric/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9272c8376ac8..9c757ae34ecc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9017,7 +9017,6 @@ let
 
   ecdsa = callPackage ../development/python-modules/ecdsa { };
 
-  numeric = callPackage ../development/python-modules/numeric { };
 
   psyco = callPackage ../development/python-modules/psyco { };
 

From 0b83f714866ea38bd9123f06b72c86c845cad3df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 8 Dec 2015 17:21:25 +0100
Subject: [PATCH 02/31] python ecdsa: remove duplicate

ecdsa was specified in python-modules/ and in python-packages.nix.
---
 .../python-modules/ecdsa/default.nix           | 18 ------------------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ecdsa/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c757ae34ecc..caba5a48b54d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9015,8 +9015,8 @@ let
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
-  ecdsa = callPackage ../development/python-modules/ecdsa { };
 
+  ecdsa = pythonPackages.ecdsa;
 
   psyco = callPackage ../development/python-modules/psyco { };
 

From 7a8671a905254dd93f738cae5cc42139be29b9ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 8 Dec 2015 17:22:51 +0100
Subject: [PATCH 03/31] python foursuite: move callPackage to
 python-packages.nix

---
 pkgs/top-level/all-packages.nix    | 3 +--
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index caba5a48b54d..332dd983f0af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9011,9 +9011,8 @@ let
     self = pypyPackages;
   });
 
-  foursuite = callPackage ../development/python-modules/4suite { };
-
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };
+  foursuite = pythonPackages.foursuite;
 
 
   ecdsa = pythonPackages.ecdsa;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d84da0312e3c..b836b90907a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7628,6 +7628,8 @@ in modules // {
     };
   });
 
+  foursuite = callPackage ../development/python-modules/4suite {};
+
   fs = buildPythonPackage rec {
     name = "fs-0.5.0";
 

From aa4777c45b17e98f239c78eef31cf7804abb773b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 10:37:58 +0100
Subject: [PATCH 04/31] python: remove psyco

---
 pkgs/development/python-modules/psyco/default.nix | 14 --------------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 16 deletions(-)
 delete mode 100644 pkgs/development/python-modules/psyco/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 332dd983f0af..9bfc7691f73d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9017,8 +9017,6 @@ let
 
   ecdsa = pythonPackages.ecdsa;
 
-  psyco = callPackage ../development/python-modules/psyco { };
-
   pycairo = pythonPackages.pycairo;
 
   pycapnp = pythonPackages.pycapnp;

From 318fa0732dce01c4a40879d8b37d2e48cf7213d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 09:17:07 +0100
Subject: [PATCH 05/31] castle_combat: mark as broken

due to pygame error.
---
 pkgs/games/castle-combat/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix
index 789b043e18f2..d4f8f7cec7ae 100644
--- a/pkgs/games/castle-combat/default.nix
+++ b/pkgs/games/castle-combat/default.nix
@@ -49,6 +49,8 @@ export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${doll
   # No test suite.
   doCheck = false;
 
+  broken = true; # pygame.error: Unrecognized music format
+
   meta = {
     description = "Castle-Combat, a clone of the old arcade game Rampart";
 

From 66f663e192d90c42c6cef01cfd3d5e1e1c111343 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 09:18:34 +0100
Subject: [PATCH 06/31] castle_combat: remove game

It was broken already (pygame sound error), and also requires numeric
which is being removed.
---
 pkgs/games/castle-combat/default.nix | 71 ----------------------------
 pkgs/top-level/all-packages.nix      |  2 -
 2 files changed, 73 deletions(-)
 delete mode 100644 pkgs/games/castle-combat/default.nix

diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix
deleted file mode 100644
index d4f8f7cec7ae..000000000000
--- a/pkgs/games/castle-combat/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ fetchurl, stdenv, buildPythonPackage, pygame, twisted, numeric, makeWrapper }:
-
-buildPythonPackage rec {
-  name = "castle-combat-0.8.1";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/castle-combat/${name}.tar.gz";
-    sha256 = "1hp4y5dgj88j9g44h4dqiakrgj8lip1krlrdl2qpffin08agrvik";
-  };
-
-  buildInputs = [ makeWrapper ];
-  propagatedBuildInputs =
-    [ pygame twisted
-
-      # XXX: `Numeric.pth' should be found by Python but it's not.
-      # Gobolinux has the same problem:
-      # http://bugs.python.org/issue1431 .
-      numeric
-    ];
-
-  patchPhase = ''
-    sed -i "src/common.py" \
-        -e "s|^data_path *=.*$|data_path = \"$out/share/${name}\"|g"
-
-    mv -v "src/"*.py .
-    sed -i "setup.py" -e's/"src"/""/g'
-  '';
-
-  postInstall = ''
-    mkdir -p "$out/share/${name}"
-    cp -rv "data/"* "$out/share/${name}"
-
-    mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat"
-  '';
-
-  postPhases = "fixLoaderPath";
-
-  fixLoaderPath =
-    let dollar = "\$"; in
-    '' sed -i "$out/bin/castle-combat" \
-           -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\
-export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""
-    '';
-      # ^
-      # `--- The run-time says: "libgcc_s.so.1 must be installed for
-      # pthread_cancel to work", which means it needs help to find it.
-
-  # No test suite.
-  doCheck = false;
-
-  broken = true; # pygame.error: Unrecognized music format
-
-  meta = {
-    description = "Castle-Combat, a clone of the old arcade game Rampart";
-
-    longDescription = ''
-      Castle-Combat is a clone of the old arcade game Rampart.  Up to
-      four players (or more in future versions) build castle walls,
-      place cannons inside these walls, and shoot at the walls of
-      their enemy(s).  If a player cannot build a complete wall around
-      one of his castles, he loses.  The last surviving player wins.
-    '';
-
-    homepage = http://www.linux-games.com/castle-combat/;
-
-    license = "unknown";
-
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bfc7691f73d..69dfafb4ef57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13958,8 +13958,6 @@ let
 
   bzflag = callPackage ../games/bzflag { };
 
-  castle_combat = callPackage ../games/castle-combat { };
-
   cataclysm-dda = callPackage ../games/cataclysm-dda { };
 
   chessdb = callPackage ../games/chessdb { };

From fa45088ae9f42fcdd52d24210050a0d5e2a61cc5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:02:36 +0100
Subject: [PATCH 07/31] python bsddb3: move and update expression

The updated expression uses buildPythonPackage and thus installs a
wheel. Unfortunately, setting the --berkeley-db flag seems to fail.
---
 .../python-modules/bsddb3/default.nix         | 12 ---------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 26 +++++++++++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/development/python-modules/bsddb3/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69dfafb4ef57..96f70e77559d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9011,9 +9011,9 @@ let
     self = pypyPackages;
   });
 
-  bsddb3 = callPackage ../development/python-modules/bsddb3 { };
   foursuite = pythonPackages.foursuite;
 
+  bsddb3 = pythonPackages.bsddb3;
 
   ecdsa = pythonPackages.ecdsa;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b836b90907a8..af2fd384386d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1673,6 +1673,32 @@ in modules // {
      };
    };
 
+  bsddb3 = buildPythonPackage rec {
+    name = "bsddb3-${version}";
+    version = "6.1.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
+      sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi";
+    };
+
+    buildInputs = [ pkgs.db ];
+
+    # Path to database need to be set.
+    # Somehow the setup.py flag is not propagated.
+    #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
+    # We can also use a variable
+    preConfigure = ''
+      export BERKELEYDB_DIR=${pkgs.db};
+    '';
+
+    meta = {
+      description = "Python bindings for Oracle Berkeley DB";
+      homepage = http://www.jcea.es/programacion/pybsddb.htm;
+      license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
+    };
+  };
+
   bokeh = buildPythonPackage rec {
     name = "bokeh-${version}";
     version = "0.10.0";

From dbdfda7871b096a76bb9ab3f3706a614a3de3bff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 09:53:11 +0100
Subject: [PATCH 08/31] python bsddb3: 6.1.0 -> 6.1.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af2fd384386d..5a188d488d7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1675,11 +1675,11 @@ in modules // {
 
   bsddb3 = buildPythonPackage rec {
     name = "bsddb3-${version}";
-    version = "6.1.0";
+    version = "6.1.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
-      sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi";
+      sha256 = "6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3";
     };
 
     buildInputs = [ pkgs.db ];

From 88bcfa64418cce711e30cf21723fe99f3a6be885 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:04:56 +0100
Subject: [PATCH 09/31] python pycups: 1.9.68 -> 1.9.73 and move expression

---
 .../python-modules/pycups/default.nix          | 18 ------------------
 pkgs/top-level/all-packages.nix                |  2 +-
 pkgs/top-level/python-packages.nix             | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pycups/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96f70e77559d..25c6be1e6c77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9023,7 +9023,7 @@ let
 
   pycrypto = pythonPackages.pycrypto;
 
-  pycups = callPackage ../development/python-modules/pycups { };
+  pycups = pythonPackages.pycups;
 
   pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a188d488d7e..3b683477bc66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14150,6 +14150,24 @@ in modules // {
     };
   });
 
+  pycups = buildPythonPackage rec {
+    name = "pycups-${version}";
+    version = "1.9.73";
+
+    src = pkgs.fetchurl {
+      url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
+      sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";
+    };
+
+    buildInputs = [ pkgs.cups ];
+
+    meta = {
+      description = "Python bindings for libcups";
+      homepage = http://cyberelk.net/tim/software/pycups/;
+      license = with licenses; [ gpl2Plus ];
+    };
+
+  };
 
   pycurl = buildPythonPackage (rec {
     name = "pycurl-7.19.5";

From 292b943ec6c9a9dc0c33190a36743845142ad8c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:06:38 +0100
Subject: [PATCH 10/31] python pyqt4: use version already in
 python-packages.nix

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25c6be1e6c77..a75f13d8ab61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9045,7 +9045,7 @@ let
 
   rhpl = callPackage ../development/python-modules/rhpl { };
 
-  pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { };
+  pyqt4 = pythonPackages.pyqt4;
 
   pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
 

From bc97b365d35afcb25800de54d9668f15352f71ce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:07:39 +0100
Subject: [PATCH 11/31] python pygame: move callPackage to python-packages.nix

---
 pkgs/development/python-modules/pygame/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix                    | 2 +-
 pkgs/top-level/python-packages.nix                 | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a75f13d8ab61..1dfe8cabf1d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9027,7 +9027,7 @@ let
 
   pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
 
-  pygame = callPackage ../development/python-modules/pygame { };
+  pygame = pythonPackages.pygame;
 
   pygobject = pythonPackages.pygobject;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b683477bc66..4764bca3bfc4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -142,6 +142,8 @@ in modules // {
 
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
+  pygame = callPackage ../development/python-modules/pygame { };
+
   pygobject = callPackage ../development/python-modules/pygobject { };
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };

From 4c0bc553f5bd48919ee22d0e63ed47ccd560b506 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:08:01 +0100
Subject: [PATCH 12/31] python pygtksourceview: move callPackage to
 python-packages.nix

---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1dfe8cabf1d7..06f01abee733 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9035,7 +9035,7 @@ let
 
   pygtk = pythonPackages.pygtk;
 
-  pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
+  pygtksourceview = pythonPackages.pygtksourceview;
 
   pyGtkGlade = pythonPackages.pyGtkGlade;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4764bca3bfc4..5f9c3187020a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -150,6 +150,8 @@ in modules // {
 
   pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };
 
+  pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
+
   pyGtkGlade = self.pygtk.override {
     libglade = pkgs.gnome.libglade;
   };

From 3e75b475f83713567e3d305dd3814ba93bc13f10 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:31:34 +0100
Subject: [PATCH 13/31] python pyx: 0.10 -> 0.14.1 rewrite expression

- Update version
- Rewrite expression using buildPythonPackage
- Current version only works of PyX only works with Python >= 3.2
---
 .../python-modules/pyx/default.nix            | 40 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-packages.nix            | 18 +++++++++
 3 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyx/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06f01abee733..a920636a3d6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9057,8 +9057,6 @@ let
 
   pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
 
-  pyx = callPackage ../development/python-modules/pyx { };
-
   pyxml = callPackage ../development/python-modules/pyxml { };
 
   rbtools = callPackage ../development/python-modules/rbtools { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5f9c3187020a..d3f2b0769026 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14450,6 +14450,24 @@ in modules // {
     };
   };
 
+  pyx = buildPythonPackage rec {
+    name = "pyx-${version}";
+    version = "0.14.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyX/PyX-${version}.tar.gz";
+      sha256 = "05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912";
+    };
+
+    disabled = !isPy3k;
+
+    meta = {
+      description = "Python package for the generation of PostScript, PDF, and SVG files";
+      homepage = http://pyx.sourceforge.net/;
+      license = with licenses; [ gpl2 ];
+    };
+  };
+
   mmpython = buildPythonPackage rec {
     version = "0.4.10";
     name = "mmpython-${version}";

From f9acc95a09b09096fd3a69d6861a2c9fc9cebaf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:40:48 +0100
Subject: [PATCH 14/31] python rbtools: move expression to python-packages.nix

cc @domenkozar
---
 .../python-modules/rbtools/default.nix        | 17 ----------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 20 +++++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/python-modules/rbtools/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a920636a3d6d..20f1faae1bb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9059,7 +9059,7 @@ let
 
   pyxml = callPackage ../development/python-modules/pyxml { };
 
-  rbtools = callPackage ../development/python-modules/rbtools { };
+  rbtools = pythonPackages.rbtools;
 
   setuptools = pythonPackages.setuptools;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3f2b0769026..b9db41d6ed9f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15618,6 +15618,26 @@ in modules // {
     };
   };
 
+  rbtools = buildPythonPackage rec {
+    name = "rbtools-0.7.2";
+
+    src = pkgs.fetchurl {
+      url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz";
+      sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i";
+    };
+
+    buildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ modules.sqlite3 six ];
+
+    checkPhase = "nosetests";
+
+    disabled = isPy3k;
+
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
+    };
+  };
+
   rencode = buildPythonPackage rec {
     name = "rencode-${version}";
     version = "git20150810";

From e60da70c3bed490ead40c7d4a77f4b455dbd1ebd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:46:04 +0100
Subject: [PATCH 15/31] python slowaes: move expression to python-packages.nix

---
 .../python-modules/slowaes/default.nix         | 16 ----------------
 pkgs/top-level/all-packages.nix                |  2 +-
 pkgs/top-level/python-packages.nix             | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/python-modules/slowaes/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20f1faae1bb3..d183f588a8e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9063,7 +9063,7 @@ let
 
   setuptools = pythonPackages.setuptools;
 
-  slowaes = callPackage ../development/python-modules/slowaes { };
+  slowaes = pythonPackages.slowaes;
 
   wxPython = pythonPackages.wxPython;
   wxPython28 = pythonPackages.wxPython28;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9db41d6ed9f..d2d1abb72385 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16917,6 +16917,24 @@ in modules // {
     };
   };
 
+  slowaes = buildPythonPackage rec {
+    name = "slowaes-${version}";
+    version = "0.1a1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz";
+      sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09";
+    };
+
+    disabled = isPy3k;
+
+    meta = {
+      homepage = "http://code.google.com/p/slowaes/";
+      description = "AES implemented in pure python";
+      license = with licenses; [ asl20 ];
+    };
+  };
+
   snowballstemmer = buildPythonPackage rec {
     name = "snowballstemmer-1.2.0";
 

From 3c5e03d8c064d2d1baea9fb88b52686f012d58b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 11:14:41 +0100
Subject: [PATCH 16/31] python xmpppy: move expression to python-packages.nix

---
 .../python-modules/xmpppy/default.nix         | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 21 ++++++++++++++++++
 3 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/python-modules/xmpppy/default.nix

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";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d183f588a8e7..a20438ae340d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3635,7 +3635,7 @@ let
 
   xmltv = callPackage ../tools/misc/xmltv { };
 
-  xmpppy = callPackage ../development/python-modules/xmpppy { };
+  xmpppy = pythonPackages.xmpppy;
 
   xorriso = callPackage ../tools/cd-dvd/xorriso { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2d1abb72385..5257702dbb1b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22382,6 +22382,27 @@ in modules // {
     };
   };
 
+  xmpppy = buildPythonPackage rec {
+    name = "xmpp.py-${version}";
+    version = "0.5.0rc1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
+      sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
+    };
+
+    preInstall = ''
+      mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
+      export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
+    '';
+
+    disabled = isPy3k;
+
+    meta = {
+      description = "XMPP python library";
+    };
+  };
+
   xstatic-bootbox = buildPythonPackage rec {
     name = "XStatic-Bootbox-${version}";
     version = "4.3.0.1";

From d2b7b5660b14525b27b1eb90082e8cdd130c6031 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 11:20:16 +0100
Subject: [PATCH 17/31] python mygpoclient: move expression to
 python-packages.nix

---
 .../python-modules/mygpoclient/default.nix    | 28 -----------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 30 +++++++++++++++++++
 3 files changed, 31 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mygpoclient/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a20438ae340d..584fedb47250 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7872,7 +7872,7 @@ let
 
   muparser = callPackage ../development/libraries/muparser { };
 
-  mygpoclient = callPackage ../development/python-modules/mygpoclient { };
+  mygpoclient = pythonPackages.mygpoclient;
 
   mygui = callPackage ../development/libraries/mygui {};
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5257702dbb1b..9ea72de19bf2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10189,6 +10189,36 @@ in modules // {
     };
   });
 
+  mygpoclient = buildPythonPackage rec {
+    name = "mygpoclient-${version}";
+    version = "1.7";
+
+    src = pkgs.fetchurl {
+      url = "https://thp.io/2010/mygpoclient/${name}.tar.gz";
+      sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e";
+    };
+
+    buildInputs = with self; [ nose minimock ];
+
+    checkPhase = ''
+      nosetests
+    '';
+
+    disabled = isPy3k;
+
+    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 = with licenses; [ gpl3 ];
+      platforms = with platforms; [ linux darwin ];
+      maintainers = with maintainers; [ skeidel ];
+    };
+  };
+
   plover = buildPythonPackage rec {
     name = "plover-${version}";
     version = "2.5.8";

From 9186d3169ad0bf2b62ee797e6bed30073b1573e9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 11:38:41 +0100
Subject: [PATCH 18/31] python irclib: move expression to python-packages.nix

- Use external paver instead of built-in
- Only works with Python 2.x
---
 .../python-modules/irclib/default.nix         | 23 ----------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 27 +++++++++++++++++++
 3 files changed, 28 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/python-modules/irclib/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 584fedb47250..7e556c73ea8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2818,7 +2818,7 @@ let
 
   pythonDBus = dbus_python;
 
-  pythonIRClib = callPackage ../development/python-modules/irclib { };
+  pythonIRClib = pythonPackages.pythonIRClib;
 
   pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ea72de19bf2..68483466dc1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8774,6 +8774,33 @@ in modules // {
     propagatedBuildInputs = with self; [ self.nose self.ipython ];
   };
 
+  pythonIRClib = buildPythonPackage rec {
+    name = "irclib-${version}";
+    version = "0.4.8";
+
+    src = pkgs.fetchurl {
+      url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
+      sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
+    };
+
+    patches = [(pkgs.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";
+
+    propagatedBuildInputs = with self; [ paver ];
+
+    disabled = isPy3k;
+    meta = {
+      description = "Python IRC library";
+      homepage = https://bitbucket.org/jaraco/irc;
+      license = with licenses; [ lgpl21 ];
+    };
+  };
+
   iso8601 = buildPythonPackage {
     name = "iso8601-0.1.10";
     src = pkgs.fetchurl {

From 8a61d3699f2d6b9b62fb0c0c5aab2545add27ca7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 11:58:38 +0100
Subject: [PATCH 19/31] python pycangjie: call package from python-packages.nix

---
 pkgs/development/python-modules/pycangjie/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 2 +-
 pkgs/top-level/python-packages.nix                    | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 68a56dedc3a5..8001f0b43a93 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
-, sqlite, python3, cython3
+, sqlite, python, cython
 }:
 
 stdenv.mkDerivation rec {
@@ -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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e556c73ea8a..7181bb65e723 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2810,7 +2810,7 @@ let
 
   pyatspi = callPackage ../development/python-modules/pyatspi { };
 
-  pycangjie = callPackage ../development/python-modules/pycangjie { };
+  pycangjie = pythonPackages.pycangjie;
 
   pydb = callPackage ../development/tools/pydb { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68483466dc1a..0f84285c5f03 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -140,6 +140,8 @@ in modules // {
   pycairo = callPackage ../development/python-modules/pycairo {
   };
 
+  pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}";
+
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
   pygame = callPackage ../development/python-modules/pygame { };

From 6938b74d2cafc24a70a3c627f6c3c0182f6f956d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 12:20:45 +0100
Subject: [PATCH 20/31] python dbus: use callPackage in python-packages.nix

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7181bb65e723..bb235ab056b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6248,9 +6248,7 @@ let
   dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
   dbus_glib       = callPackage ../development/libraries/dbus-glib { };
   dbus_java       = callPackage ../development/libraries/java/dbus-java { };
-  dbus_python     = callPackage ../development/python-modules/dbus {
-    isPyPy = python.executable == "pypy";
-  };
+  dbus_python     = pythonPackages.dbus;
 
   # Should we deprecate these? Currently there are many references.
   dbus_tools = pkgs.dbus.tools;

From 1d84bff14c090816eed17c8f18140028a3db2937 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 14:18:58 +0100
Subject: [PATCH 21/31] python pycairo: add python.libPrefix

---
 pkgs/development/python-modules/pycairo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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";

From 2aa37ad8a292970de9d30c37fdc6b06d54e62bc7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 14:19:13 +0100
Subject: [PATCH 22/31] python pycangjie: add python.libPrefix

---
 pkgs/development/python-modules/pycangjie/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 8001f0b43a93..f8ca06eec86d 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pycangjie-${version}";
+  name = "${python.libPrefix}-pycangjie-${version}";
   version = "1.3_rev_${rev}";
   rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
 

From 7d08a9c877c3b43129fc667e6d8dee13f98523c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 14:19:29 +0100
Subject: [PATCH 23/31] python pyqt: add python.libPrefix

---
 pkgs/development/python-modules/pyqt/4.x.nix | 2 +-
 pkgs/development/python-modules/pyqt/5.x.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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";

From a11c7584ca504e32dcf9ea364589f5984c6eeec0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 10 Dec 2015 21:39:11 +0100
Subject: [PATCH 24/31] python pyside: 1.2.2 -> 1.2.4

---
 pkgs/development/python-modules/pyside/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index d274283594ab..f81a2fda56c7 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.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;

From 2ed93d74d5218607e607b3e63a1f9ed9f34715ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 10 Dec 2015 21:40:00 +0100
Subject: [PATCH 25/31] python pyside shiboken: 1.2.2 -> 1.2.4

---
 pkgs/development/python-modules/pyside/shiboken.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 5e266aba7d0d..c2550a852f7f 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }:
 
-stdenv.mkDerivation {
-  name = "pyside-shiboken-1.2.2";
+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;

From 515a13b1f50fad34482457c616e6c5d090c2da3c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 11:05:26 +0100
Subject: [PATCH 26/31] python pyside: move callPackage to python-packages.nix

This should make pyside available for all Python versions.
---
 .../development/python-modules/pyside/apiextractor.nix |  6 +++---
 pkgs/development/python-modules/pyside/default.nix     |  2 +-
 .../python-modules/pyside/generatorrunner.nix          |  6 +++---
 pkgs/development/python-modules/pyside/shiboken.nix    |  9 ++++++---
 pkgs/development/python-modules/pyside/tools.nix       |  6 +++---
 pkgs/top-level/all-packages.nix                        | 10 +++++-----
 pkgs/top-level/python-packages.nix                     | 10 ++++++++++
 7 files changed, 31 insertions(+), 18 deletions(-)

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 f81a2fda56c7..fc009a208b70 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }:
+{ stdenv, fetchurl, cmake, python, pysideGeneratorrunner, pysideShiboken, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "${python.libPrefix}-pyside-${version}";
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 c2550a852f7f..549b6275a8ce 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
 
-stdenv.mkDerivation rec {
+# 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";
 
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
 
   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."
@@ -19,6 +20,8 @@ stdenv.mkDerivation rec {
       \"$\{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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb235ab056b4..51510e542d4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9045,15 +9045,15 @@ let
 
   pyqt4 = pythonPackages.pyqt4;
 
-  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
+  pysideApiextractor = pythonPackages.pysideApiextractor;
 
-  pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
+  pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner;
 
-  pyside = callPackage ../development/python-modules/pyside { };
+  pyside = pythonPackages.pyside;
 
-  pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
+  pysideTools = pythonPackages.pysideTools;
 
-  pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
+  pysideShiboken = pythonpackages.pysideShiboken;
 
   pyxml = callPackage ../development/python-modules/pyxml { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f84285c5f03..86b2822e7ea1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -169,6 +169,16 @@ in modules // {
     qt5 = pkgs.qt5;
   };
 
+  pyside = callPackage ../development/python-modules/pyside { };
+
+  pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
+
+  pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
+
+  pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
+
+  pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
+
   sip = callPackage ../development/python-modules/sip { };
 
   sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { };

From b2d9b48c979253588f1fa5420c770ed0546473c5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 11:08:03 +0100
Subject: [PATCH 27/31] python awscli: move to python-packages.nix

---
 pkgs/tools/admin/awscli/default.nix | 40 -----------------------------
 pkgs/top-level/all-packages.nix     |  2 +-
 pkgs/top-level/python-packages.nix  | 38 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/tools/admin/awscli/default.nix

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
deleted file mode 100644
index 39ea3d637fc0..000000000000
--- a/pkgs/tools/admin/awscli/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, pythonPackages, groff }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "awscli-${version}";
-  version = "1.9.6";
-  namePrefix = "";
-
-  src = fetchFromGitHub {
-    owner = "aws";
-    repo = "aws-cli";
-    rev = version;
-    sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2";
-  };
-
-  propagatedBuildInputs = [
-    pythonPackages.botocore
-    pythonPackages.bcdoc
-    pythonPackages.six
-    pythonPackages.colorama
-    pythonPackages.docutils
-    pythonPackages.rsa
-    pythonPackages.pyasn1
-    groff
-  ];
-
-  postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
-    mkdir -p $out/share/zsh/site-functions
-    mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
-    rm $out/bin/aws.cmd
-  '';
-
-  meta = {
-    homepage = https://aws.amazon.com/cli/;
-    description = "Unified tool to manage your AWS services";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ muflax ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51510e542d4d..008fb0b8e79a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -577,7 +577,7 @@ let
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
-  awscli = callPackage ../tools/admin/awscli { };
+  awscli = pythonPackages.aswcli;
 
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86b2822e7ea1..58239aeb7944 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -952,6 +952,44 @@ in modules // {
     };
   }));
 
+  awscli = buildPythonPackage rec {
+    name = "awscli-${version}";
+    version = "1.9.6";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "aws";
+      repo = "aws-cli";
+      rev = version;
+      sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2";
+    };
+
+    propagatedBuildInputs = with self; [
+      botocore
+      bcdoc
+      six
+      colorama
+      docutils
+      rsa
+      pyasn1
+      pkgs.groff
+    ];
+
+    postInstall = ''
+      mkdir -p $out/etc/bash_completion.d
+      echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+      mkdir -p $out/share/zsh/site-functions
+      mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+      rm $out/bin/aws.cmd
+    '';
+
+    meta = {
+      homepage = https://aws.amazon.com/cli/;
+      description = "Unified tool to manage your AWS services";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with maintainers; [ muflax ];
+    };
+  };
+
   azure = buildPythonPackage rec {
     version = "0.11.0";
     name = "azure-${version}";

From fe9ef9fd6003291082fede845f3bff5f7413f060 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 11:12:39 +0100
Subject: [PATCH 28/31] python botocore: 1.3.6 -> 1.3.12

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58239aeb7944..2b5c262a9e4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1856,12 +1856,12 @@ in modules // {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.3.6";
+    version = "1.3.12";
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "05a0ihv66fx77j16mjlm76d8zm7sd5wfzh1hx4nm3ilb9gz5h016";
+      sha256 = "6f4f09234aca23db2e66c548b98a4fb14516241b31fb473c9c6f5b21270900c6";
     };
 
     propagatedBuildInputs =

From a82fd1730cb6080d7298ba2438f1262993162de5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 11:12:49 +0100
Subject: [PATCH 29/31] python awscli: 1.9.6 -> 1.9.12

---
 pkgs/top-level/all-packages.nix    |  2 +-
 pkgs/top-level/python-packages.nix | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 008fb0b8e79a..2893a5c43702 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -577,7 +577,7 @@ let
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
-  awscli = pythonPackages.aswcli;
+  awscli = pythonPackages.awscli;
 
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b5c262a9e4d..5fa5fca5735e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -501,7 +501,6 @@ in modules // {
     };
   };
 
-
   anyjson = buildPythonPackage rec {
     name = "anyjson-0.3.3";
     disabled = isPy3k;
@@ -954,13 +953,11 @@ in modules // {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.9.6";
+    version = "1.9.12";
 
-    src = pkgs.fetchFromGitHub {
-      owner = "aws";
-      repo = "aws-cli";
-      rev = version;
-      sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz";
+      sha256 = "0b50de084c8de70adf45c0e938b6350344d9b6acde8b7cdee02cb32964bc58fd";
     };
 
     propagatedBuildInputs = with self; [

From 14167636fc6e3501cc27f2d25f9fcd4288f129ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 11:24:56 +0100
Subject: [PATCH 30/31] python ansible: move to python-packages.nix

---
 pkgs/tools/system/ansible/default.nix | 33 ---------------------------
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/python-packages.nix    | 31 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/system/ansible/default.nix

diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
deleted file mode 100644
index ab5cea30873d..000000000000
--- a/pkgs/tools/system/ansible/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
-
-pythonPackages.buildPythonPackage rec {
-  version = "1.9.4";
-  name = "ansible-${version}";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "https://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = true;
-
-  pythonPath = with pythonPackages; [
-    paramiko jinja2 pyyaml httplib2 boto six
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.ansible.com";
-    description = "A simple automation tool";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.joamaki ];
-    platforms = platforms.linux ++ [ "x86_64-darwin" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2893a5c43702..9c9f89835a2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5379,7 +5379,7 @@ let
 
   augeas = callPackage ../tools/system/augeas { };
 
-  ansible = callPackage ../tools/system/ansible { };
+  ansible = pythonPackages.ansible;
 
   ansible2 = callPackage ../tools/system/ansible/2.nix { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5fa5fca5735e..971e952ef475 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -556,6 +556,37 @@ in modules // {
     };
   };
 
+  ansible = buildPythonPackage rec {
+    version = "1.9.4";
+    name = "ansible-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://releases.ansible.com/ansible/${name}.tar.gz";
+      sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p";
+    };
+
+    prePatch = ''
+      sed -i "s,/usr/,$out," lib/ansible/constants.py
+    '';
+
+    doCheck = false;
+    dontStrip = true;
+    dontPatchELF = true;
+    dontPatchShebangs = true;
+    windowsSupport = true;
+
+    propagatedBuildInputs = with self; [
+      paramiko jinja2 pyyaml httplib2 boto six
+    ] ++ optional windowsSupport pywinrm;
+
+    meta = {
+      homepage = "http://www.ansible.com";
+      description = "A simple automation tool";
+      license = with licenses; [ gpl3] ;
+      maintainers = with maintainers; [ joamaki ];
+      platforms = with platforms; [ linux darwin ];
+    };
+  };
   apipkg = buildPythonPackage rec {
     name = "apipkg-1.4";
 

From f2ac29648aff2048225324845e73be056f7e58b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 11 Dec 2015 11:25:08 +0100
Subject: [PATCH 31/31] python ansible2: move to python-packages.nix

---
 pkgs/tools/system/ansible/2.nix    | 33 ------------------------------
 pkgs/top-level/all-packages.nix    |  2 +-
 pkgs/top-level/python-packages.nix | 33 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/system/ansible/2.nix

diff --git a/pkgs/tools/system/ansible/2.nix b/pkgs/tools/system/ansible/2.nix
deleted file mode 100644
index 21469e645bb7..000000000000
--- a/pkgs/tools/system/ansible/2.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
-
-pythonPackages.buildPythonPackage rec {
-  version    = "v2.0.0_0.6.rc1";
-  name       = "ansible-${version}";
-  namePrefix = "";
-
-  src = fetchurl {
-    url    = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz";
-    sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = true;
-
-  pythonPath = with pythonPackages; [
-    paramiko jinja2 pyyaml httplib2 boto six
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage    = "http://www.ansible.com";
-    description = "A simple automation tool";
-    license     = licenses.gpl3;
-    maintainers = [ maintainers.copumpkin ];
-    platforms   = platforms.linux ++ [ "x86_64-darwin" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c9f89835a2b..cc40cbd5e9f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5381,7 +5381,7 @@ let
 
   ansible = pythonPackages.ansible;
 
-  ansible2 = callPackage ../tools/system/ansible/2.nix { };
+  ansible2 = pythonPackages.ansible2;
 
   antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 971e952ef475..bde8d29221c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -587,6 +587,39 @@ in modules // {
       platforms = with platforms; [ linux darwin ];
     };
   };
+
+  ansible2 = buildPythonPackage rec {
+    version    = "v2.0.0_0.6.rc1";
+    name       = "ansible-${version}";
+
+    src = pkgs.fetchurl {
+      url    = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz";
+      sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd";
+    };
+
+    prePatch = ''
+      sed -i "s,/usr/,$out," lib/ansible/constants.py
+    '';
+
+    doCheck = false;
+    dontStrip = true;
+    dontPatchELF = true;
+    dontPatchShebangs = true;
+    windowsSupport = true;
+
+    propagatedBuildInputs = with self; [
+      paramiko jinja2 pyyaml httplib2 boto six
+    ] ++ optional windowsSupport pywinrm;
+
+    meta = with stdenv.lib; {
+      homepage    = "http://www.ansible.com";
+      description = "A simple automation tool";
+      license     = with licenses; [ gpl3 ];
+      maintainers = with maintainers; [ copumpkin ];
+      platforms   = with platforms; [ linux darwin ];
+    };
+  };
+
   apipkg = buildPythonPackage rec {
     name = "apipkg-1.4";