From 8f1266482df58a5627b7660c423b5b40d7d54805 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 7 Aug 2021 18:07:43 -0400 Subject: [PATCH] python3Packages.mayavi: 4.7.1 -> 4.7.3 --- pkgs/development/python-modules/mayavi/default.nix | 11 ++++++----- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 2fd53660907..169928e48b6 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -1,17 +1,17 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook +{ lib, buildPythonPackage, pythonOlder, fetchPypi, wrapQtAppsHook , pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5 }: buildPythonPackage rec { pname = "mayavi"; - version = "4.7.1"; + version = "4.7.3"; - disabled = isPy27; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; - sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; + extension = "tar.gz"; + sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA="; }; postPatch = '' @@ -31,6 +31,7 @@ buildPythonPackage rec { ]; doCheck = false; # Needs X server + pythonImportsCheck = [ "mayavi" ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3c95703547..9cfbd8f79ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4414,7 +4414,7 @@ in { maya = callPackage ../development/python-modules/maya { }; 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; };