Skip to content

Commit 70ff571

Browse files
authored
python312Packages.mayavi: fix build, pin to numpy_1 (#382970)
2 parents df472f9 + 21fe7f2 commit 70ff571

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
buildPythonPackage,
55
envisage,
66
fetchPypi,
7-
numpy,
7+
numpy_1,
88
packaging,
99
pyface,
1010
pygments,
1111
pyqt5,
1212
pythonOlder,
1313
pythonAtLeast,
14+
stdenv,
1415
traitsui,
1516
vtk,
1617
wrapQtAppsHook,
@@ -33,7 +34,7 @@ buildPythonPackage rec {
3334
propagatedBuildInputs = [
3435
apptools
3536
envisage
36-
numpy
37+
numpy_1
3738
packaging
3839
pyface
3940
pygments
@@ -59,5 +60,8 @@ buildPythonPackage rec {
5960
license = licenses.bsdOriginal;
6061
maintainers = with maintainers; [ ];
6162
mainProgram = "mayavi2";
63+
# Fails during stripping with:
64+
# The file was not recognized as a valid object file
65+
broken = stdenv.hostPlatform.isDarwin;
6266
};
6367
}

pkgs/top-level/python-packages.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8070,7 +8070,9 @@ self: super: with self; {
80708070

80718071
mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
80728072
inherit buildPythonPackage pythonOlder pythonAtLeast;
8073-
inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5;
8073+
# when next release contains numpy2 support unpin
8074+
# https://github.com/enthought/mayavi/pull/1315
8075+
inherit (self) pyface pygments numpy_1 packaging vtk traitsui envisage apptools pyqt5;
80748076
};
80758077

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

0 commit comments

Comments
 (0)