lol

matplotlib: remove optional gtk2

+2 -8
+1 -4
pkgs/development/python-modules/matplotlib/2.nix
··· 1 1 { stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache 2 2 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver 3 - , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 3 + , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 4 4 , fetchpatch 5 5 , enableGhostscript ? false, ghostscript ? null, gtk3 6 - , enableGtk2 ? false, pygtk ? null, gobject-introspection 7 6 , enableGtk3 ? false, cairo 8 7 # darwin has its own "MacOSX" backend 9 8 , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null ··· 14 13 }: 15 14 16 15 assert enableGhostscript -> ghostscript != null; 17 - assert enableGtk2 -> pygtk != null; 18 16 assert enableTk -> (tcl != null) 19 17 && (tk != null) 20 18 && (tkinter != null) ··· 45 43 [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver 46 44 libpng mock pytz ] 47 45 ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache 48 - ++ stdenv.lib.optional enableGtk2 pygtk 49 46 ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] 50 47 ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] 51 48 ++ stdenv.lib.optionals enableQt [ pyqt4 ]
+1 -4
pkgs/development/python-modules/matplotlib/default.nix
··· 1 1 { stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache 2 2 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver 3 - , freetype, libpng, pkgconfig, mock, pytz, pygobject3 3 + , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection 4 4 , enableGhostscript ? true, ghostscript ? null, gtk3 5 - , enableGtk2 ? false, pygtk ? null, gobject-introspection 6 5 , enableGtk3 ? false, cairo 7 6 # darwin has its own "MacOSX" backend 8 7 , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null ··· 13 12 }: 14 13 15 14 assert enableGhostscript -> ghostscript != null; 16 - assert enableGtk2 -> pygtk != null; 17 15 assert enableTk -> (tcl != null) 18 16 && (tk != null) 19 17 && (tkinter != null) ··· 46 44 [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver 47 45 libpng mock pytz ] 48 46 ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache 49 - ++ stdenv.lib.optional enableGtk2 pygtk 50 47 ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] 51 48 ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] 52 49 ++ stdenv.lib.optionals enableQt [ pyqt5 ];