alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

python{2,3}Packages.matplotlib: remove pointless asserts

Browse source
This commit is contained in:
Dmitry Kalinkin 2021-04-11 01:39:38 -04:00 committed by github-actions[bot]
parent de797ef97e
commit 72a1c0cbc4
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/python-modules/matplotlib/2.nix
View file

@ -2,23 +2,15 @@
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
, fetchpatch
, enableGhostscript ? false, ghostscript ? null, gtk3
, enableGhostscript ? false, ghostscript, gtk3
, enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11
, enableQt ? false, pyqt4
, Cocoa
, pythonOlder
}:
assert enableGhostscript -> ghostscript != null;
assert enableTk -> (tcl != null)
&& (tk != null)
&& (tkinter != null)
&& (libX11 != null)
;
assert enableQt -> pyqt4 != null;
buildPythonPackage rec {
version = "2.2.3";
pname = "matplotlib";

14
pkgs/development/python-modules/matplotlib/default.nix
View file

@ -2,23 +2,15 @@
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
, certifi, pillow
, enableGhostscript ? true, ghostscript ? null, gtk3
, enableGhostscript ? true, ghostscript, gtk3
, enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt5 ? null
, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11
, enableQt ? false, pyqt5
, Cocoa
, pythonOlder
}:
assert enableGhostscript -> ghostscript != null;
assert enableTk -> (tcl != null)
&& (tk != null)
&& (tkinter != null)
&& (libX11 != null)
;
assert enableQt -> pyqt5 != null;
buildPythonPackage rec {
version = "3.4.1";
pname = "matplotlib";