- adding experimental python31 build

- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

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

3 files changed, 0 insertions, 45 deletions

diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix
deleted file mode 100644
index ad8c39b4ea7..00000000000
--- a/pkgs/development/python-modules/wxPython/2.6.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{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
deleted file mode 100644
index 5cab740f8c3..00000000000
--- a/pkgs/development/python-modules/wxPython/2.8.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{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
deleted file mode 100644
index ed7177081f9..00000000000
--- a/pkgs/development/python-modules/wxPython/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-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