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: 0851cfb06367
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e9a5187d1eac
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 24, 2020

  1. pythonPackages.pyqtgraph: convert to pyqt5

    @drewrisinger
    drewrisinger authored and Jonathan Ringer committed Nov 24, 2020
    Copy the full SHA
    e9a5187 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/development/python-modules/pyqtgraph/default.nix
11 changes: 7 additions & 4 deletions pkgs/development/python-modules/pyqtgraph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, scipy
, numpy
, pyqt4
, pyopengl
, pyqt5
, scipy
}:

buildPythonPackage rec {
@@ -16,13 +16,16 @@ buildPythonPackage rec {
sha256 = "0p5k73wjfh0zzjvby8b5107cx7x0c2rdj66zh1nc8y95i0anf2na";
};

propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ];
propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ];

doCheck = false; # tries to create windows (QApps) on collection, which fails (probably due to no display)

doCheck = false; # "PyQtGraph requires either PyQt4 or PySide; neither package could be imported."
pythonImportsCheck = [ "pyqtgraph" ];

meta = with stdenv.lib; {
description = "Scientific Graphics and GUI Library for Python";
homepage = "http://www.pyqtgraph.org/";
changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ koral ];