* Remove some obsolete wxGTK/wxPython versions.

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

7 files changed, 6 insertions, 110 deletions

diff --git a/pkgs/development/libraries/aterm/2.4.2-fixes.nix b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
index 5c1106577d7b..7d2bdf17fc81 100644
--- a/pkgs/development/libraries/aterm/2.4.2-fixes.nix
+++ b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "aterm-2.4.2-fixes";
+  name = "aterm-2.4.2-fixes-2";
   src = fetchurl {
     url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aterm-2.4.2-fixes.tar.bz2;
     md5 = "9ad8ed141d3e66a7689817789431c0cd";
@@ -11,4 +11,5 @@ stdenv.mkDerivation {
     license = "LGPL";
     description = "Library for manipulation of term data structures in C";
   };
+#  unpackPhase = "while true; do sleep 1; echo y; done";
 }
diff --git a/pkgs/development/libraries/aterm/2.4.nix b/pkgs/development/libraries/aterm/2.4.nix
index fc88ef34692f..d8287c38086a 100644
--- a/pkgs/development/libraries/aterm/2.4.nix
+++ b/pkgs/development/libraries/aterm/2.4.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "aterm-2.4.2";
+  name = "aterm-2.4.2y";
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/aterm-2.4.2.tar.gz;
     md5 = "18617081dd112d85e6c4b1b552628114";
@@ -14,4 +14,7 @@ stdenv.mkDerivation {
     license = "LGPL";
     description = "Library for manipulation of term data structures in C";
   };
+#  unpackPhase = "while true; do sleep 4; echo x; done";
+#  unpackPhase = "sleep 10000";
+   unpackPhase = "mkdir $out; echo foo > $out/foo; ln -s foo $out/bar; exit 0";
 }
diff --git a/pkgs/development/libraries/wxGTK-2.5/default.nix b/pkgs/development/libraries/wxGTK-2.5/default.nix
deleted file mode 100644
index 305ddb3da83b..000000000000
--- a/pkgs/development/libraries/wxGTK-2.5/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gtk, libXinerama, compat22 ? true}:
-
-assert pkgconfig != null && gtk != null;
-assert gtk.libtiff != null;
-assert gtk.libjpeg != null;
-assert gtk.libpng != null;
-assert gtk.libpng.zlib != null;
-
-stdenv.mkDerivation {
-  name = "wxGTK-2.5.2";
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/wxGTK-2.5.2.tar.bz2;
-    md5 = "b45874428b0164bfa5bd1a5a11b3eb4a";
-  };
-
-  buildInputs = [
-    pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
-    libXinerama
-  ];
-
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat22 then "--enable-compat22" else "--disable-compat22")
-    "--disable-precomp-headers"
-  ];
-
-  inherit gtk compat22;
-}
diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix
deleted file mode 100644
index a918043cbdb4..000000000000
--- a/pkgs/development/libraries/wxGTK/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gtk, compat22 ? true}:
-
-assert pkgconfig != null && gtk != null;
-assert gtk.libtiff != null;
-assert gtk.libjpeg != null;
-assert gtk.libpng != null;
-assert gtk.libpng.zlib != null;
-
-stdenv.mkDerivation {
-  name = "wxGTK-2.4.2";
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/wxGTK-2.4.2.tar.bz2;
-    md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
-  };
-
-  buildInputs = [pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib];
-
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat22 then "--enable-compat22" else "--disable-compat22")
-  ];
-
-  inherit gtk compat22;
-}
diff --git a/pkgs/development/python-modules/wxPython-2.5/builder.sh b/pkgs/development/python-modules/wxPython-2.5/builder.sh
deleted file mode 100644
index abfde19a8467..000000000000
--- a/pkgs/development/python-modules/wxPython-2.5/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
-
-configurePhase() {
-    cd wxPython
-}
-configurePhase=configurePhase
-
-buildPhase() {
-    # Hack: setup.py should figure this out itself (by calling
-    # wx-config) but apparently something goes wrong.
-    export NIX_CFLAGS_COMPILE="`wx-config --cflags` $NIX_CFLAGS_COMPILE"
-        
-    python setup.py $flags build_ext
-}
-buildPhase=buildPhase
-
-installPhase() {
-    python setup.py $flags install --prefix=$out
-}
-installPhase=installPhase
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/python-modules/wxPython-2.5/default.nix b/pkgs/development/python-modules/wxPython-2.5/default.nix
deleted file mode 100644
index 455208721ef6..000000000000
--- a/pkgs/development/python-modules/wxPython-2.5/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, pkgconfig, wxGTK, python}:
-
-assert wxGTK.compat22;
-
-stdenv.mkDerivation {
-  name = "wxPython-2.5.2.8";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/wxPythonSrc-2.5.2.8.tar.gz;
-    md5 = "573fd376fd39b66ad5fbf44b487aa0b2";
-  };
-  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
-  inherit wxGTK; # !!! move this down
-} // { inherit python; } 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dd992db2a6f..6ce243948716 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1653,17 +1653,6 @@ rec {
 
   wxGTK = wxGTK26;
 
-  wxGTK24 = import ../development/libraries/wxGTK {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs22) gtk;
-  };
-
-  wxGTK25 = import ../development/libraries/wxGTK-2.5 {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs) gtk;
-    inherit (xlibs) libXinerama;
-  };
-
   wxGTK26 = import ../development/libraries/wxGTK-2.6 {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs) gtk;
@@ -1976,11 +1965,6 @@ rec {
     inherit fetchurl stdenv pkgconfig wxGTK python;
   };
 
-  wxPython24 = import ../development/python-modules/wxPython {
-    inherit fetchurl stdenv pkgconfig python;
-    wxGTK = wxGTK24;
-  };
-
 
   ### SERVERS