summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-10-11 19:46:31 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2011-10-11 19:46:31 +0000
commit2ed828052e8eca4e57baf84c59fc99c2b103313f (patch)
tree8a4c2e6b5e32643b607566fc28a507fc4ae3afae /pkgs
parent2c6200c02551ab1b873e39b8e1cb7cea27023c3e (diff)
Remove wxPython26 since it is not used
svn path=/nixpkgs/trunk/; revision=29773
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/wxPython/2.6.nix18
-rw-r--r--pkgs/top-level/all-packages.nix1
-rw-r--r--pkgs/top-level/python-packages.nix8
3 files changed, 0 insertions, 27 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 362f52bf44fcd..0000000000000
--- a/pkgs/development/python-modules/wxPython/2.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
-
-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) pythonPackages.python pythonPackages.wrapPython ];
-  
-  passthru = { inherit wxGTK; };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2be53875fd6ca..64032e899ce70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4807,7 +4807,6 @@ let
   setuptools = pythonPackages.setuptools;
 
   wxPython = pythonPackages.wxPython;
-  wxPython26 = pythonPackages.wxPython26;
   wxPython28 = pythonPackages.wxPython28;
 
   twisted = pythonPackages.twisted;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index edf38bff72ad6..828f88aac4459 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2024,20 +2024,12 @@ let pythonPackages = python.modules // rec {
   wxPython = wxPython28;
 
 
-  wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit pythonPackages;
-    wxGTK = pkgs.wxGTK26;
-  };
-
-
   wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit pythonPackages;
     wxGTK = pkgs.wxGTK28;
   };
 
-
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";