Unverified Commit 70ff5713 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python312Packages.mayavi: fix build, pin to numpy_1 (#382970)

parents df472f9c 21fe7f23

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

+6 −2
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ 
  buildPythonPackage,

  envisage,

  fetchPypi,

  numpy,

  numpy_1,

  packaging,

  pyface,

  pygments,

  pyqt5,

  pythonOlder,

  pythonAtLeast,

  stdenv,

  traitsui,

  vtk,

  wrapQtAppsHook,
@@ -33,7 +34,7 @@ buildPythonPackage rec { 
  propagatedBuildInputs = [

    apptools

    envisage

    numpy

    numpy_1

    packaging

    pyface

    pygments
@@ -59,5 +60,8 @@ buildPythonPackage rec { 
    license = licenses.bsdOriginal;

    maintainers = with maintainers; [ ];

    mainProgram = "mayavi2";

    # Fails during stripping with:

    # The file was not recognized as a valid object file

    broken = stdenv.hostPlatform.isDarwin;

  };

}

pkgs/top-level/python-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -8070,7 +8070,9 @@ self: super: with self; { 














  mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {















    inherit buildPythonPackage pythonOlder pythonAtLeast;













    inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5;













    # when next release contains numpy2 support unpin













    # https://github.com/enthought/mayavi/pull/1315













    inherit (self) pyface pygments numpy_1 packaging vtk traitsui envisage apptools pyqt5;















  };





























  mayim = callPackage ../development/python-modules/mayim { };