From 2ed828052e8eca4e57baf84c59fc99c2b103313f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 11 Oct 2011 19:46:31 +0000 Subject: [PATCH] Remove wxPython26 since it is not used svn path=/nixpkgs/trunk/; revision=29773 --- .../python-modules/wxPython/2.6.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 8 -------- 3 files changed, 27 deletions(-) delete mode 100644 pkgs/development/python-modules/wxPython/2.6.nix 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 362f52bf44f..00000000000 --- 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 2be53875fd6..64032e899ce 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 edf38bff72a..828f88aac44 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";