diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-01-30 18:19:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-30 18:19:16 +0100 |
commit | e4f739fa2f42519da5f126c49b5dce3509b13580 (patch) | |
tree | a66f634f6bfbb0a0e4a4235a0c69e61a18bfb4f5 | |
parent | b8fec2384e9cfe168710e319914ee5be28307270 (diff) | |
parent | 43753eafd2c161d0f0213c3b375c7162894bf7a0 (diff) | |
download | nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.tar nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.tar.gz nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.tar.bz2 nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.tar.lz nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.tar.xz nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.tar.zst nixlib-e4f739fa2f42519da5f126c49b5dce3509b13580.zip |
Merge pull request #22003 from lsix/update_matplotlib
pythonPackages.matplotlib: 1.5.3 -> 2.0.0
-rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 5ba813deba60..9f85cb06d97c 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, python, buildPythonPackage, pycairo , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado -, freetype, libpng, pkgconfig, mock, pytz, pygobject3 +, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk3 ? false, cairo , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null -, Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx +, enableQt ? false, pyqt4 +, libcxx }: assert enableGhostscript -> ghostscript != null; @@ -15,14 +16,15 @@ assert enableTk -> (tcl != null) && (tkinter != null) && (libX11 != null) ; +assert enableQt -> pyqt4 != null; buildPythonPackage rec { name = "matplotlib-${version}"; - version = "1.5.3"; + version = "2.0.0"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "1g7bhr6v3wdxyx29rfxgf57l9w19s79cdlpyi0h4y0c5ywwxr9d0"; + sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -30,17 +32,17 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; buildInputs = [ python which sphinx stdenv ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation CoreData - cf-private libobjc ]; + ++ stdenv.lib.optional enableGhostscript ghostscript; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype - libpng pkgconfig mock pytz + [ cycler dateutil nose numpy pyparsing tornado freetype + libpng pkgconfig mock pytz ] ++ 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 enableTk [ tcl tk tkinter libX11 ] + ++ stdenv.lib.optionals enableQt [ pyqt4 ] + ++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ]; patches = [ ./basedirlist.patch ] ++ @@ -64,8 +66,8 @@ buildPythonPackage rec { ${python.interpreter} tests.py ''; - # The entry point for running tests, tests.py, is not included in the release. - # https://github.com/matplotlib/matplotlib/issues/6017 + # Test data is not included in the distribution (the `tests` folder + # is missing) doCheck = false; prePatch = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d75849a7202..a44156b2b8de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14212,8 +14212,6 @@ in { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData; - inherit (pkgs.darwin) cf-private libobjc; }; |