public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22003 from lsix/update_matplotlib

Browse Source 
pythonPackages.matplotlib: 1.5.3 -> 2.0.0
This commit is contained in:
Frederik Rietdijk 2017-01-30 18:19:16 +01:00 committed by GitHub
commit e4f739fa2f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/matplotlib/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, python, buildPythonPackage, pycairo { stdenv, fetchurl, python, buildPythonPackage, pycairo
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado , 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 , enableGhostscript ? false, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk2 ? false, pygtk ? null, gobjectIntrospection
, enableGtk3 ? false, cairo , enableGtk3 ? false, cairo
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , 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; assert enableGhostscript -> ghostscript != null;
@ -15,14 +16,15 @@ assert enableTk -> (tcl != null)
&& (tkinter != null) && (tkinter != null)
&& (libX11 != null) && (libX11 != null)
; ;
assert enableQt -> pyqt4 != null;
buildPythonPackage rec { buildPythonPackage rec {
name = "matplotlib-${version}"; name = "matplotlib-${version}";
version = "1.5.3"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@ -30,9 +32,7 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp"; XDG_RUNTIME_DIR = "/tmp";
buildInputs = [ python which sphinx stdenv ] buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional enableGhostscript ghostscript;
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation CoreData
cf-private libobjc ];
propagatedBuildInputs = propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype [ cycler dateutil nose numpy pyparsing tornado freetype
@ -40,7 +40,9 @@ buildPythonPackage rec {
] ]
++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] ++ 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 = patches =
[ ./basedirlist.patch ] ++ [ ./basedirlist.patch ] ++
@ -64,8 +66,8 @@ buildPythonPackage rec {
${python.interpreter} tests.py ${python.interpreter} tests.py
''; '';
# The entry point for running tests, tests.py, is not included in the release. # Test data is not included in the distribution (the `tests` folder
# https://github.com/matplotlib/matplotlib/issues/6017 # is missing)
doCheck = false; doCheck = false;
prePatch = '' prePatch = ''

2
pkgs/top-level/python-packages.nix
View File

@ -14212,8 +14212,6 @@ in {
matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
enableGhostscript = true; enableGhostscript = true;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData;
inherit (pkgs.darwin) cf-private libobjc;
}; };