From 48c9e493f087eecec9b78a0318f0adb5df4cca88 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 10:12:33 +1100 Subject: [PATCH 1/2] python312Packages.mayavi: fix build, pin to numpy_1 --- pkgs/development/python-modules/mayavi/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index f5099af1f8f9..540b401fcbe6 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, envisage, fetchPypi, - numpy, + numpy_1, packaging, pyface, pygments, @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ apptools envisage - numpy + numpy_1 packaging pyface pygments diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af53309e3a83..73c86573a39e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8068,7 +8068,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 { }; From 21fe7f239cddf0ec87a616aa8dfd669514790650 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 18:03:32 +1100 Subject: [PATCH 2/2] python312Packages.mayavi: mark as broken on darwin --- pkgs/development/python-modules/mayavi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 540b401fcbe6..046ef18f3628 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -11,6 +11,7 @@ pyqt5, pythonOlder, pythonAtLeast, + stdenv, traitsui, vtk, wrapQtAppsHook, @@ -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; }; }