diff options
author | K900 <me@0upti.me> | 2020-07-30 19:32:49 +0300 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-04 21:54:26 +0200 |
commit | 8e5e7e2ad82a9432970fca6d066c5ce11bb19b8a (patch) | |
tree | 38bc7cea1a7d420c91d098b344e097283b50d5b2 /pkgs/development/python-modules | |
parent | 9febe2f8fcf302b98643ea035824ba82b1b28d29 (diff) |
python3.pkgs.matplotlib: 3.2.1 -> 3.3.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/python-modules/matplotlib/setup.cfg | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 03afcfe75ae3b..774fbc2879379 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,7 @@ { 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, gobject-introspection +, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -19,14 +20,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ffe2f9cdcea1086fc414e82f42271ecf1976700b8edd16ca9d376189c6d93aee"; + sha256 = "24e8db94948019d531ce0bcd637ac24b1c8f6744ac86d2aa0eb6dbaeb1386f82"; }; XDG_RUNTIME_DIR = "/tmp"; @@ -39,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver - libpng mock pytz ] + libpng mock pytz pillow ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; diff --git a/pkgs/development/python-modules/matplotlib/setup.cfg b/pkgs/development/python-modules/matplotlib/setup.cfg index 6f81985efa446..6a77386276512 100644 --- a/pkgs/development/python-modules/matplotlib/setup.cfg +++ b/pkgs/development/python-modules/matplotlib/setup.cfg @@ -1,2 +1,5 @@ [directories] basedirlist = . + +[libs] +system_freetype = true |