wxPython: remove from top-level

This commit is contained in:
Frederik Rietdijk 2016-05-27 21:27:29 +02:00
parent f1ff46231b
commit d3714e3445

View File

@ -6519,7 +6519,9 @@ in
yodl = callPackage ../development/tools/misc/yodl { }; yodl = callPackage ../development/tools/misc/yodl { };
winpdb = callPackage ../development/tools/winpdb { }; winpdb = callPackage ../development/tools/winpdb {
inherit (pythonPackages) wxPython;
};
grabserial = callPackage ../development/tools/grabserial { }; grabserial = callPackage ../development/tools/grabserial { };
@ -9686,9 +9688,6 @@ in
twisted = pythonPackages.twisted; twisted = pythonPackages.twisted;
wxPython = pythonPackages.wxPython;
wxPython28 = pythonPackages.wxPython28;
yolk = callPackage ../development/python-modules/yolk {}; yolk = callPackage ../development/python-modules/yolk {};
ZopeInterface = pythonPackages.zope_interface; ZopeInterface = pythonPackages.zope_interface;
@ -12528,7 +12527,7 @@ in
gksu = callPackage ../applications/misc/gksu { }; gksu = callPackage ../applications/misc/gksu { };
gnuradio = callPackage ../applications/misc/gnuradio { gnuradio = callPackage ../applications/misc/gnuradio {
inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython;
fftw = fftwFloat; fftw = fftwFloat;
}; };
@ -14324,7 +14323,7 @@ in
torch-repl = lib.setName "torch-repl" torchPackages.trepl; torch-repl = lib.setName "torch-repl" torchPackages.trepl;
torchat = callPackage ../applications/networking/instant-messengers/torchat { torchat = callPackage ../applications/networking/instant-messengers/torchat {
wrapPython = pythonPackages.wrapPython; inherit (pythonPackages) wrapPython wxPython;
}; };
tortoisehg = callPackage ../applications/version-management/tortoisehg { }; tortoisehg = callPackage ../applications/version-management/tortoisehg { };