From d3714e34457fbd8a0c0eb7a927a0b1947f9ecce3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:27:29 +0200 Subject: [PATCH] wxPython: remove from top-level --- pkgs/top-level/all-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e4f97e4c19..0d4f7ffcda8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6519,7 +6519,9 @@ in yodl = callPackage ../development/tools/misc/yodl { }; - winpdb = callPackage ../development/tools/winpdb { }; + winpdb = callPackage ../development/tools/winpdb { + inherit (pythonPackages) wxPython; + }; grabserial = callPackage ../development/tools/grabserial { }; @@ -9686,9 +9688,6 @@ in twisted = pythonPackages.twisted; - wxPython = pythonPackages.wxPython; - wxPython28 = pythonPackages.wxPython28; - yolk = callPackage ../development/python-modules/yolk {}; ZopeInterface = pythonPackages.zope_interface; @@ -12528,7 +12527,7 @@ in gksu = callPackage ../applications/misc/gksu { }; gnuradio = callPackage ../applications/misc/gnuradio { - inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; + inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython; fftw = fftwFloat; }; @@ -14324,7 +14323,7 @@ in torch-repl = lib.setName "torch-repl" torchPackages.trepl; torchat = callPackage ../applications/networking/instant-messengers/torchat { - wrapPython = pythonPackages.wrapPython; + inherit (pythonPackages) wrapPython wxPython; }; tortoisehg = callPackage ../applications/version-management/tortoisehg { };