Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1f02f7cf6090
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af7378397faf
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 20, 2019

  1. pythonPackages.matplotlib: fix dependencies to use pyqt5 instead

    @f--t @FRidh
    f--t authored and FRidh committed Oct 20, 2019
    Copy the full SHA
    af73783 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/python-modules/matplotlib/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/matplotlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, enableQt ? false, pyqt5 ? null
, libcxx
, Cocoa
, pythonOlder
@@ -19,7 +19,7 @@ assert enableTk -> (tcl != null)
&& (tkinter != null)
&& (libX11 != null)
;
assert enableQt -> pyqt4 != null;
assert enableQt -> pyqt5 != null;

buildPythonPackage rec {
version = "3.1.1";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ];
++ stdenv.lib.optionals enableQt [ pyqt5 ];

patches =
[ ./basedirlist.patch ];