Merge pull request #133056 from bcdarwin/mayavi-update

python3Packages.mayavi: 4.7.1 -> 4.7.3
This commit is contained in:
Sandro 2021-08-08 05:00:09 +02:00 committed by GitHub
commit 47b4e5cee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View file

@ -1,17 +1,17 @@
{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook { lib, buildPythonPackage, pythonOlder, fetchPypi, wrapQtAppsHook
, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5 , pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mayavi"; pname = "mayavi";
version = "4.7.1"; version = "4.7.3";
disabled = isPy27; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "tar.bz2"; extension = "tar.gz";
sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA=";
}; };
postPatch = '' postPatch = ''
@ -31,6 +31,7 @@ buildPythonPackage rec {
]; ];
doCheck = false; # Needs X server doCheck = false; # Needs X server
pythonImportsCheck = [ "mayavi" ];
preFixup = '' preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}") makeWrapperArgs+=("''${qtWrapperArgs[@]}")

View file

@ -4414,7 +4414,7 @@ in {
maya = callPackage ../development/python-modules/maya { }; maya = callPackage ../development/python-modules/maya { };
mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
inherit buildPythonPackage isPy27 fetchPypi; inherit buildPythonPackage pythonOlder fetchPypi;
inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5;
}; };