From 4cccec15af91fe1ece0205de5a9e5b00449fa9cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 May 2025 16:26:51 +0200
Subject: [PATCH] python313Packages.nutils: 8.8 -> 9.0

https://github.com/evalf/nutils/releases/tag/v9.0
---
 .../python-modules/nutils/default.nix         | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index 77a13f70659a..8c5c8a4c3076 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/pkgs/development/python-modules/nutils/default.nix
@@ -4,19 +4,21 @@
   fetchFromGitHub,
   flit-core,
   appdirs,
-  bottombar,
+  matplotlib,
+  meshio,
   numpy,
   nutils-poly,
-  psutil,
+  scipy,
   stringly,
   treelog,
   pytestCheckHook,
   pythonOlder,
+  pkgs,
 }:
 
 buildPythonPackage rec {
   pname = "nutils";
-  version = "8.8";
+  version = "9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,32 +27,45 @@ buildPythonPackage rec {
     owner = "evalf";
     repo = "nutils";
     tag = "v${version}";
-    hash = "sha256-E/y1YXW+0+LfntRQsdIU9rMOmN8mlFwXktD/sViJo3I=";
+    hash = "sha256-Ef830yTY+g6ZPZ9h0lSktkewIerHbWVfXwrdQ6rzz6I=";
   };
 
   build-system = [ flit-core ];
 
   dependencies = [
     appdirs
-    bottombar
     numpy
     nutils-poly
-    psutil
     stringly
     treelog
   ];
 
+  optional-dependencies = {
+    export-mpl = [ matplotlib ];
+    # TODO: matrix-mkl = [ mkl ];
+    matrix-scipy = [ scipy ];
+    import-gmsh = [ meshio ];
+  };
+
   pythonRelaxDeps = [ "psutil" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pkgs.graphviz
+    pytestCheckHook
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  disabledTests = [
+    # Error: invalid value 'x' for farg: loading 'x' as float
+    "run.test_badvalue"
+    "choose.test_badvalue"
+    # ModuleNotFoundError: No module named 'stringly'
+    "picklability.test_basis"
+    "picklability.test_domain"
+    "picklability.test_geom"
+  ];
 
   pythonImportsCheck = [ "nutils" ];
 
-  disabledTestPaths = [
-    # AttributeError: type object 'setup' has no attribute '__code__'
-    "tests/test_cli.py"
-  ];
-
   meta = with lib; {
     description = "Numerical Utilities for Finite Element Analysis";
     changelog = "https://github.com/evalf/nutils/releases/tag/v${version}";