From 79e6c758eb11eb7037d1282c3a38922ca7d1a26b Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 15 Feb 2025 21:40:09 -0500
Subject: [PATCH 1/2] python312Packages.sumo: modernize

---
 .../python-modules/sumo/default.nix           | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix
index 3cf6e4150683..6f94f35451f3 100644
--- a/pkgs/development/python-modules/sumo/default.nix
+++ b/pkgs/development/python-modules/sumo/default.nix
@@ -3,24 +3,25 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  cython,
-  h5py,
-  matplotlib,
-  numpy,
-  phonopy,
-  pymatgen,
-  scipy,
-  seekpath,
+  setuptools,
   spglib,
+  numpy,
+  scipy,
+  h5py,
+  pymatgen,
+  phonopy,
+  matplotlib,
+  seekpath,
   castepxbin,
-  pytestCheckHook,
   colormath,
+  importlib-resources,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "sumo";
   version = "2.3.10";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -31,30 +32,35 @@ buildPythonPackage rec {
     hash = "sha256-WoOW+JPo5x9V6LN+e8Vf3Q3ohHhQVK81s0Qk7oPn1Tk=";
   };
 
-  nativeBuildInputs = [ cython ];
-
-  propagatedBuildInputs = [
-    castepxbin
-    colormath
-    h5py
-    matplotlib
-    numpy
-    phonopy
-    pymatgen
-    scipy
-    seekpath
-    spglib
+  build-system = [
+    setuptools
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  dependencies = [
+    spglib
+    numpy
+    scipy
+    h5py
+    pymatgen
+    phonopy
+    matplotlib
+    seekpath
+    castepxbin
+    colormath
+    importlib-resources
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "sumo" ];
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit for plotting and analysis of ab initio solid-state calculation data";
     homepage = "https://github.com/SMTG-UCL/sumo";
     changelog = "https://github.com/SMTG-Bham/sumo/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ psyanticy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ psyanticy ];
   };
 }

From 1215ea96c55576e55a40fa32374fe427987faa2a Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 15 Feb 2025 22:28:47 -0500
Subject: [PATCH 2/2] python312Packages.numericalunits: fix build

---
 .../python-modules/numericalunits/default.nix | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix
index 5fc21a89e878..5f62372502f6 100644
--- a/pkgs/development/python-modules/numericalunits/default.nix
+++ b/pkgs/development/python-modules/numericalunits/default.nix
@@ -1,26 +1,39 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  isPy3k,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
-  version = "1.26";
-  format = "setuptools";
   pname = "numericalunits";
+  version = "1.26";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-igtplF3WXqz27vjIaLzTKY10OfWIL1B7tgYOwgxyPhI=";
+  src = fetchFromGitHub {
+    owner = "sbyrnes321";
+    repo = "numericalunits";
+    tag = "numericalunits-${version}";
+    hash = "sha256-vPB1r+j+p9n+YLnBjHuk2t+QSr+adEOjyC45QSbeb4M=";
   };
 
-  disabled = !isPy3k;
+  build-system = [
+    setuptools
+  ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests/tests.py"
+  ];
+
+  meta = {
     homepage = "http://pypi.python.org/pypi/numericalunits";
     description = "Package that lets you define quantities with unit";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }