* Reverted most of the recent Python refactorings, as discussed. It's

  a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196

3 files changed, 45 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix
new file mode 100644
index 000000000000..ad8c39b4ea7a
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/2.6.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, wxGTK, python}:
+
+assert wxGTK.unicode;
+
+stdenv.mkDerivation {
+  name = "wxPython-2.6.3.3";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2;
+    md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
+  };
+  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
+  inherit wxGTK; # !!! move this down
+}
diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix
new file mode 100644
index 000000000000..5cab740f8c3b
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/2.8.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, wxGTK, python}:
+
+assert wxGTK.unicode;
+
+stdenv.mkDerivation {
+  name = "wxPython-2.8.4.0";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = mirror://sourceforge/wxpython/wxPython-src-2.8.4.0.tar.bz2;
+    sha256 = "0lkj29jcw3kqaf2iphgmmn9cqf2ppkm6qqr9izlx4bvn9dihgq6h";
+  };
+  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
+  passthru = {inherit wxGTK;};
+}
diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh
new file mode 100644
index 000000000000..ed7177081f9f
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/builder.sh
@@ -0,0 +1,17 @@
+source $stdenv/setup
+
+flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"
+
+configurePhase() {
+    cd wxPython
+}
+
+buildPhase() {
+    python setup.py $flags build
+}
+
+installPhase() {
+    python setup.py $flags install --prefix=$out
+}
+
+genericBuild