Unverified Commit 479e2144 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #310111 from doronbehar/pkg/mayavi 

Revert "python3Packages.mayavi: disable for python 3.11"
parents 2464c25a 58be3dc4

pkgs/development/python-modules/mayavi/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ 


buildPythonPackage rec {

  pname = "mayavi";

  # TODO: Remove meta.broken on next release.

  version = "4.8.1";

  format = "setuptools";

  disabled = pythonOlder "3.8" || pythonAtLeast "3.11";



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;
@@ -85,5 +87,8 @@ buildPythonPackage rec { 
    homepage = "https://github.com/enthought/mayavi";

    license = licenses.bsdOriginal;

    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";

  };

}

pkgs/top-level/python-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -7255,7 +7255,8 @@ self: super: with self; { 
  maya = callPackage ../development/python-modules/maya { };















  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 { };