Merge pull request #310111 from doronbehar/pkg/mayavi

Revert "python3Packages.mayavi: disable for python 3.11"
This commit is contained in:
Doron Behar 2024-05-08 22:09:11 +03:00 committed by GitHub
commit 479e2144ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions

View File

@ -18,9 +18,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mayavi"; pname = "mayavi";
# TODO: Remove meta.broken on next release.
version = "4.8.1"; version = "4.8.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8" || pythonAtLeast "3.11";
disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
@ -85,5 +87,8 @@ buildPythonPackage rec {
homepage = "https://github.com/enthought/mayavi"; homepage = "https://github.com/enthought/mayavi";
license = licenses.bsdOriginal; license = licenses.bsdOriginal;
maintainers = with maintainers; [ knedlsepp ]; maintainers = with maintainers; [ knedlsepp ];
# Should be fixed in a version from after March 26, see:
# https://github.com/enthought/mayavi/issues/1284#issuecomment-2020631244
broken = pythonAtLeast "3.12";
}; };
} }

View File

@ -7255,7 +7255,8 @@ self: super: with self; {
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 (self) buildPythonPackage pythonOlder pythonAtLeast pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; inherit buildPythonPackage pythonOlder pythonAtLeast;
inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5;
}; };
mayim = callPackage ../development/python-modules/mayim { }; mayim = callPackage ../development/python-modules/mayim { };