matplotlib: 2.2.3 -> 3.0.2
Python 3 will use the new matplotlib 3.x while Python 2 will use 2.x. matplotlib: keep 2.2.3 for Python2k
This commit is contained in:
committed by
Frederik Rietdijk
parent
961180afc8
commit
880fae6a08
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
|
||||
{ stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
|
||||
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||
, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
|
||||
, enableGhostscript ? false, ghostscript ? null, gtk3
|
||||
, enableGhostscript ? true, ghostscript ? null, gtk3
|
||||
, enableGtk2 ? false, pygtk ? null, gobjectIntrospection
|
||||
, enableGtk3 ? false, cairo
|
||||
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
|
||||
@@ -21,12 +21,14 @@ assert enableTk -> (tcl != null)
|
||||
assert enableQt -> pyqt4 != null;
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.2.3";
|
||||
version = "3.0.2";
|
||||
pname = "matplotlib";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5";
|
||||
sha256 = "c94b792af431f6adb6859eb218137acd9a35f4f7442cea57e4a59c54751c36af";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
|
||||
@@ -44,8 +46,7 @@ buildPythonPackage rec {
|
||||
++ stdenv.lib.optional enableGtk2 pygtk
|
||||
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
|
||||
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
|
||||
++ stdenv.lib.optionals enableQt [ pyqt4 ]
|
||||
++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
|
||||
++ stdenv.lib.optionals enableQt [ pyqt4 ];
|
||||
|
||||
patches =
|
||||
[ ./basedirlist.patch ] ++
|
||||
@@ -84,9 +85,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python plotting library, making publication quality plots";
|
||||
homepage = "http://matplotlib.sourceforge.net/";
|
||||
homepage = "https://matplotlib.org/";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user