Commit Graph

77 Commits

Author SHA1 Message Date
Robert Schütz
2cae050057
python2Packages: remove superfluous overrides
Since Python 2 is not supported anymore we only keep those overrides
which are used by leaf packages.
2022-01-01 02:10:53 +01:00
Mauricio Collares
b28ccde5be
python3Packages.matplotlib: 3.5.0 -> 3.5.1 (#151423) 2021-12-20 12:17:20 -05:00
Dmitry Kalinkin
7dc4430751
python3Packages.matplotlib: switch to use an absolute path in MPLSETUPCFG
The upstream made a transition setup.cfg -> mplsetup.cfg
93b5c0fb08

This should allow us to be compatible with some reasonable version overrides
https://github.com/NixOS/nixpkgs/pull/147742#issuecomment-995178116
2021-12-15 16:03:13 -05:00
Dmitry Kalinkin
69221cf2d2
python3Packages.matplotlib: setup.cfg -> mplsetup.cfg
This addresses a regression on darwin.

An alternative to this would be to set MPLSETUPCFG as was suggested in
2021-12-15 14:50:20 -05:00
Fabian Affolter
b59406317b python3Packages.matplotlib: update requirements 2021-12-02 16:00:08 +01:00
Jonathan Ringer
478e92ba24
python3Packages.matplotlib: remove debug lines 2021-11-30 18:52:48 -08:00
Jonathan Ringer
819d9f9a60
python3Packages.matplotlib: fix build, disable network fetch of deps 2021-11-30 18:52:46 -08:00
Jonathan Ringer
ebb34bc2e6
python3Packages.matplotlib: 3.4.3 -> 3.5.0 2021-11-30 18:52:04 -08:00
Samuel Ainsworth
d95c1e9516
python3Packages.matplotlib: 3.4.2 -> 3.4.3 (#134906) 2021-08-21 15:30:13 -04:00
Robert Schütz
1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Martin Weinelt
9d17f6c26f python3Packages.matplotlib: 3.4.1 -> 3.4.2 2021-06-22 13:42:33 +02:00
rnhmjoj
7672576a0d
pythonPackages.matplotlib: add licenses 2021-05-26 08:23:44 +02:00
rnhmjoj
3a3e1134a8
pythonPackages.matplotlib: remove unsused arguments 2021-05-26 08:00:28 +02:00
rnhmjoj
7e2ec8f8a1
pythonPackages.matplotlib: fix headless detection
The default backend is chosen based on the content of the $DISPLAY
variable *and* a successfull call to libX11, loaded via dlopen().
The test fails because dlopen looks in /usr/lib and /lib, so matplotlib
falls back to a headless backend.

To reproduce try running:

    $ nix-shell -I nixpkgs=$PWD -p \
      'python3.withPackages (p: [ p.matplotlib ])' --run python
    >>> import matplotlib.pyplot as plt
    >>> assert plt.get_backend() == "TkAgg"
2021-05-26 07:53:20 +02:00
Dmitry Kalinkin
72a1c0cbc4 python{2,3}Packages.matplotlib: remove pointless asserts 2021-04-20 19:47:48 +00:00
Dmitry Kalinkin
de797ef97e python2Packages.matplotlib: remove invalid libs.system_freetype setup option 2021-04-20 19:47:47 +00:00
Dmitry Kalinkin
e6d9e58289 python3Packages.matplotlib: 3.3.4 -> 3.4.1 2021-04-20 19:47:47 +00:00
Dmitry Kalinkin
72cb029367 python{2,3}Packages.matplotlib: use lib.generators.toINI to generate setup.cfg 2021-04-20 19:47:47 +00:00
Frederik Rietdijk
dbcad7f7bb python3Packages.matplotlib: 3.3.3 -> 3.3.4 2021-02-26 11:01:49 +01:00
Pavol Rusnak
a4bbfba80d
pkgs/development/python-modules: stdenv.lib -> lib 2021-01-24 01:29:22 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Frederik Rietdijk
2398277abf python3Packages.matplotlib: 3.3.2 -> 3.3.3 2020-12-01 14:44:14 +01:00
Frederik Rietdijk
1fb6a29362 python3Packages.matplotlib: 3.3.1 -> 3.3.2 2020-11-05 15:47:00 -08:00
Shea Levy
31579c6b0a
matplotlib: Disable LTO on darwin.
Needs #19312 or equivalent to work.
2020-09-09 12:18:50 -04:00
Jonathan Ringer
a93c4f5129
python3Packages.matplotlib: fix deps 2020-08-16 21:42:57 -07:00
Frederik Rietdijk
1bcc07f8f5 python: matplotlib: 3.3.0 -> 3.3.1 2020-08-16 19:31:07 +02:00
K900
8e5e7e2ad8 python3.pkgs.matplotlib: 3.2.1 -> 3.3.0 2020-08-04 21:54:26 +02:00
Dmitry Kalinkin
c7d4882ab1
python3Packages.matplotlib: 3.1.3 -> 3.2.1, and various cleanups (#84362)
* pythonPackages.matplotlib: add veprbl to maintainers

* pythonPackages.matplotlib: remove an old darwin hack

* pythonPackages.matplotlib: remove python and stdenv from buildInputs

* python3Packages.matplotlib: remove a hack for python33

* pythonPackages.matplotlib: remove outdated checkPhase

Downloading the baseline_images is not a real issue, building against
older freetype (local_freetype = True) is, perhaps, not what we
want. The good news is that the tests would pass (tested on 3.2.1) if
we were to enable them:

========== 6684 passed, 1332 skipped, 10 xfailed in 228.64s (0:03:48) ==========

* pythonPackages.matplotlib: provide setup.cfg from a file instead of a patch

* python3Packages.matplotlib: 3.1.3 -> 3.2.1
2020-04-21 07:56:13 +02:00
Ben Darwin
5842ec9368 python3Packages.matplotlib: remove nose from propagatedBuildInputs 2020-03-27 10:53:07 -07:00
Frederik Rietdijk
ac307d0097 python: matplotlib: 3.1.2 -> 3.1.3 2020-02-09 09:17:31 +01:00
Frederik Rietdijk
250363dc6e python: matplotlib: 3.1.1 -> 3.1.2 2019-12-15 16:23:15 +01:00
worldofpeace
48fdd1a255 matplotlib: remove optional gtk2 2019-12-10 22:40:45 -05:00
ft
af7378397f pythonPackages.matplotlib: fix dependencies to use pyqt5 instead 2019-10-20 11:09:12 +02:00
Dmitry Kalinkin
af9c22af35 python3Packages.matplotlib: 3.0.3 -> 3.1.1 2019-07-04 14:38:28 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
0fe315c9b6 treewide: remove old patches for macOS
These shouldn’t be needed now that we are on macOS 10.12.
2019-04-26 21:54:32 -04:00
Silvan Mosberger
06f883f7a0
Merge pull request #51344 from timokau/sagenb-matplotlib-fix
pythonPackages.matplotlib: enable tk backend by default
2019-03-29 18:17:13 +01:00
Matthieu Coudron
0752393738 python3Packages.matplotlib: 3.0.2 -> 3.0.3 2019-03-07 10:07:29 +01:00
Frederik Rietdijk
4256099a33 matplotlib: fix pkgconfig situation
We need pkgs.pkgconfig, and not pythonPackages.pkgconfig.
2019-02-17 14:40:51 +01:00
Frederik Rietdijk
0c3197ec08 Revert "python.pkgs.matplotlib: use pkgs.pkgconfig"
This reverts commit c78f98db56.
2019-02-17 14:40:51 +01:00
Timo Kaufmann
56d92ba70c python.pkgs.matplotlib: add numpy 1.6 compat patch
Numpy deprecated asscalar in 1.16. This will be fixed in the next
matplotlib version, but to avoid deprecation warnings (and because they
are breaking the sage testsuite), it can't hurt to backport the fix
already.

Upstream: https://github.com/matplotlib/matplotlib/pull/12478
2019-02-11 21:39:21 +01:00
Robert Schütz
c78f98db56 python.pkgs.matplotlib: use pkgs.pkgconfig 2019-01-18 09:38:23 +01:00
Frederik Rietdijk
63bcd07888 python: add isPy2 attribute to passthru
Some packages relied on it. For consistency, also introduce isPy3 (which
is the same as isPy3k).
2019-01-04 12:31:42 +01:00
Timo Kaufmann
dca6628d1a pythonPackages.matplotlib: enable tk backend by default
We currently do not build mathplotlib with any backend. This can be very
confusing for users. They will try to use matplotlib and it will simply
display nothing (see #51337). We should ship at least one backend. `tk`
was chosen somewhat arbitrarily. The gtk backend is problematic (see
https://github.com/NixOS/nixpkgs/issues/50959#issuecomment-441327767)
so tkinter seems like a good choice.

There is already a backend provided on darwin so there is no reason to
include tk there.
2018-12-03 21:07:59 +01:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Sebastien Maret
880fae6a08 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
2018-11-11 10:14:25 +01:00
Frederik Rietdijk
1bc66be7e8 python: matplotlib: 2.2.2 -> 2.2.3 2018-08-25 07:38:22 +02:00
Frederik Rietdijk
ced21f5e1a pythonPackages: remove name attribute`
The `buildPython*` function computes name from `pname` and `version`.
This change removes `name` attribute from all expressions in
`pkgs/development/python-modules`.

While at it, some other minor changes were made as well, such as
replacing `fetchurl` calls with `fetchPypi`.
2018-06-23 18:14:26 +02:00
Frederik Rietdijk
f927d46e6f python: matplotlib: 2.1.2 -> 2.2.2 2018-04-08 11:34:54 +02:00