From d8010161a6dd070a78686baf7f36dcff7165d21c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 9 Jan 2023 21:53:04 +0100
Subject: [PATCH 1/3] python3Packages.scooby: init at 0.7.0

---
 .../python-modules/scooby/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/scooby/default.nix

diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
new file mode 100644
index 000000000000..3fb2ee90116d
--- /dev/null
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "scooby";
+  version = "0.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-scD/uuAtepatt8Yn7b6PJMfSj9AT7iOy0HuVHyVvEhk=";
+  };
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  pythonImportsCheck = [ "scooby" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/banesullivan/scooby";
+    description = "Report hardware information and Python package versions";
+    license = licenses.mit;
+    maintainers = with maintainers; [ wegank ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e35d915c962d..7769da8f5e71 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10163,6 +10163,8 @@ self: super: with self; {
 
   scour = callPackage ../development/python-modules/scour { };
 
+  scooby = callPackage ../development/python-modules/scooby { };
+
   scp = callPackage ../development/python-modules/scp { };
 
   scramp = callPackage ../development/python-modules/scramp { };

From 8e00e58c117b08f3b31915e3aee0b9b71bb42ec7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 9 Jan 2023 13:20:56 +0100
Subject: [PATCH 2/3] python3Packages.pyvista: init at 0.37.0

---
 .../python-modules/pyvista/default.nix        | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyvista/default.nix

diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
new file mode 100644
index 000000000000..e2ceb1d776f2
--- /dev/null
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, imageio
+, numpy
+, pillow
+, pooch
+, scooby
+, vtk
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pyvista";
+  version = "0.37.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-02osbV9T9HOrapJBZpaTrO56UXk5Tcl1ldoUzB3iMUE=";
+  };
+
+  propagatedBuildInputs = [
+    imageio
+    numpy
+    pillow
+    pooch
+    scooby
+    vtk
+  ];
+
+  checkInputs = [
+    unittestCheckHook
+  ];
+
+  meta = with lib; {
+    homepage = "https://pyvista.org";
+    description = "Easier Pythonic interface to VTK";
+    license = licenses.mit;
+    maintainers = with maintainers; [ wegank ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7769da8f5e71..31bf4a5f2273 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9470,6 +9470,8 @@ self: super: with self; {
 
   pyvisa-py = callPackage ../development/python-modules/pyvisa-py { };
 
+  pyvista = callPackage ../development/python-modules/pyvista { };
+
   pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };
 
   pyvizio = callPackage ../development/python-modules/pyvizio { };

From b754b1a6aac49de8656d35b1150176c6204b72af Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 9 Jan 2023 21:54:32 +0100
Subject: [PATCH 3/3] python3Packages.sfepy: 2022.1 -> 2022.3

---
 .../python-modules/scooby/default.nix         |  2 +-
 .../python-modules/sfepy/default.nix          | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index 3fb2ee90116d..bdcc62963a73 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/banesullivan/scooby";
-    description = "Report hardware information and Python package versions";
+    description = "A lightweight tool for reporting Python package versions and hardware resources";
     license = licenses.mit;
     maintainers = with maintainers; [ wegank ];
   };
diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix
index 03f3b64ee509..8e1089c3798a 100644
--- a/pkgs/development/python-modules/sfepy/default.nix
+++ b/pkgs/development/python-modules/sfepy/default.nix
@@ -14,19 +14,21 @@
 , mpi4py
 , psutil
 , openssh
+, pyvista
+, pytest
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "sfepy";
-  version = "2022.1";
+  version = "2022.3";
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "sfepy";
     repo = "sfepy";
     rev = "release_${version}";
-    sha256 = "sha256-OayULh/dGI5sEynYMc+JLwUd67zEGdIGEKo6CTOdZS8=";
+    sha256 = "sha256-6AhyO6LRG6N62ZAoPCZpRKu4ZBzj9IHkurhKFIPFAJI=";
   };
 
   propagatedBuildInputs = [
@@ -41,34 +43,38 @@ buildPythonPackage rec {
     mpi4py
     psutil
     openssh
+    pyvista
   ];
 
   postPatch = ''
     # broken tests
-    rm tests/test_meshio.py
+    rm sfepy/tests/test_meshio.py
 
     # slow tests
-    rm tests/test_input_*.py
-    rm tests/test_elasticity_small_strain.py
-    rm tests/test_term_call_modes.py
-    rm tests/test_refine_hanging.py
-    rm tests/test_hyperelastic_tlul.py
-    rm tests/test_poly_spaces.py
-    rm tests/test_linear_solvers.py
-    rm tests/test_quadratures.py
+    rm sfepy/tests/test_io.py
+    rm sfepy/tests/test_elasticity_small_strain.py
+    rm sfepy/tests/test_term_call_modes.py
+    rm sfepy/tests/test_refine_hanging.py
+    rm sfepy/tests/test_hyperelastic_tlul.py
+    rm sfepy/tests/test_poly_spaces.py
+    rm sfepy/tests/test_linear_solvers.py
+    rm sfepy/tests/test_quadratures.py
   '';
 
+  checkInputs = [
+    pytest
+  ];
+
   checkPhase = ''
     export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh
     export HOME=$TMPDIR
     mv sfepy sfepy.hidden
     mkdir -p $HOME/.matplotlib
     echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
-    ${python.interpreter} run_tests.py -o $TMPDIR/test_outputs --raise
+    ${python.interpreter} -c "import sfepy; sfepy.test()"
   '';
 
   meta = with lib; {
-    broken = stdenv.isLinux && stdenv.isAarch64;
     homepage = "https://sfepy.org/";
     description = "Simple Finite Elements in Python";
     license = licenses.bsd3;