From 1c418186cfd21e148b86b10637fe92c2010d0cb5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 15:51:15 +0100 Subject: [PATCH 1/2] python312Packages.scikit-fmm: remove stale substituteInPlace, unbreak --- pkgs/development/python-modules/scikit-fmm/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index ef2f73c33b2c..17a023e9efc1 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -18,11 +18,6 @@ buildPythonPackage rec { hash = "sha256-q6hqteXv600iH7xpCKHgRLkJYSpy9hIf/QnlsYI+jh4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "oldest-supported-numpy" "numpy" - ''; - build-system = [ meson-python ]; dependencies = [ numpy ]; From bd2ea530520ba20a22deb31368a055baa5ad0f70 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 15:51:29 +0100 Subject: [PATCH 2/2] python312Packages.scikit-fmm: run checkPhase hooks, echo check command --- pkgs/development/python-modules/scikit-fmm/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 17a023e9efc1..f7fac9f6394f 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -23,8 +23,13 @@ buildPythonPackage rec { dependencies = [ numpy ]; checkPhase = '' + runHook preCheck + # "Do not run the tests from the source directory" mkdir testdir; cd testdir - ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())" + (set -x + ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())" + ) + runHook postCheck ''; meta = with lib; {