From 548221b58adb40301f5c41ce6819a613856f5d88 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 15:24:36 -0500
Subject: [PATCH 1/7] python312Packages.type-infer: relax dependency on numpy

---
 pkgs/development/python-modules/type-infer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index b4e544a607ae..80bc703c8405 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -48,6 +48,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "psutil"
     "py3langid"
+    "numpy"
   ];
 
   build-system = [ poetry-core ];

From 86d4992360bfaed67e6f8bf864a47e60e3b92943 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 15:25:50 -0500
Subject: [PATCH 2/7] python312Packages.dataprep-ml: relax dependency on numpy

---
 pkgs/development/python-modules/dataprep-ml/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix
index df952df2bd0a..a041d06a2711 100644
--- a/pkgs/development/python-modules/dataprep-ml/default.nix
+++ b/pkgs/development/python-modules/dataprep-ml/default.nix
@@ -39,7 +39,10 @@ buildPythonPackage rec {
     hash = "sha256-pZhHlNcQJLBww7ur2Z6Yb2IdbRsBtjzQAzfa4UzGKt4=";
   };
 
-  pythonRelaxDeps = [ "pydantic" ];
+  pythonRelaxDeps = [
+    "pydantic"
+    "numpy"
+  ];
 
   nativeBuildInputs = [
     poetry-core

From 5accc82dfb5c46850dd6cff6ca0a9cf6585f7129 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 15:27:31 -0500
Subject: [PATCH 3/7] python312Packages.diffenator2: relax dependency on
 unicodedata2

---
 pkgs/development/python-modules/diffenator2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix
index afd87a2b2434..2cef0d7db511 100644
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonRelaxDepsHook,
   pytestCheckHook,
   poetry-core,
   poetry-dynamic-versioning,
@@ -43,6 +42,7 @@ buildPythonPackage rec {
     "protobuf"
     "python-bidi"
     "youseedee"
+    "unicodedata2"
   ];
 
   build-system = [

From a02d5ce854255650efc5e911dd42e2232c7b43af Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 15:30:35 -0500
Subject: [PATCH 4/7] python312Packages.ibis-framework: relax dependency on
 toolz

---
 pkgs/development/python-modules/ibis-framework/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 2492811b8ce7..38047d77638d 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -112,6 +112,10 @@ buildPythonPackage rec {
   dontBypassPoetryDynamicVersioning = true;
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = lib.head (lib.strings.splitString "-" version);
 
+  pythonRelaxDeps = [
+    "toolz"
+  ];
+
   dependencies = [
     atpublic
     parsy

From 7ef6e94ff3d3673fe5678084844e145a6a3c3adc Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 15:54:31 -0500
Subject: [PATCH 5/7] python312Packages.mindsdb-evaluator: relax dependency on
 numpy

---
 .../python-modules/mindsdb-evaluator/default.nix          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
index 00c54bde3245..ddf33f5ef005 100644
--- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix
+++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
@@ -25,9 +25,13 @@ buildPythonPackage rec {
     hash = "sha256-/3xRPrKzYAdSlY+sQxwCUzKhf3NJBSyWG2Q0ZKb6v3U=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  dependencies = [
     dataprep-ml
     numpy
     pandas

From 7b9148e27ab7dd6dc3e67b2cbe31cbd3f211fd3a Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 15:57:18 -0500
Subject: [PATCH 6/7] python312Packages.fontmake: 3.9.0 -> 3.10.0

Diff: https://github.com/googlefonts/fontmake/compare/v3.9.0...v3.10.0

Changelog: https://github.com/googlefonts/fontmake/releases/tag/v3.10.0
---
 pkgs/development/python-modules/fontmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 7a4bca9d1fb9..5572181e7cf6 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "fontmake";
-  version = "3.9.0";
+  version = "3.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "fontmake";
     rev = "v${version}";
-    hash = "sha256-q6ul9MYbq85RpZE0ozHOCBNAR4r9InIjumadT1GyJ6k=";
+    hash = "sha256-ZlK8QyZ5cIEphFiZXMV/Z5pL9H62X2UwLBtpwLGpUMQ=";
   };
 
   build-system = [

From 383959baa6a6d19d7fa52a4bb9add0dde3825819 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 1 Feb 2025 16:03:38 -0500
Subject: [PATCH 7/7] python312Packages.fontmake: fix build with fonttools 4.55

---
 pkgs/development/python-modules/fontmake/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 5572181e7cf6..37c4a52a1237 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pytestCheckHook,
   fontmath,
   fonttools,
@@ -26,6 +27,16 @@ buildPythonPackage rec {
     hash = "sha256-ZlK8QyZ5cIEphFiZXMV/Z5pL9H62X2UwLBtpwLGpUMQ=";
   };
 
+  patches = [
+    # Update to FontTools 4.55 and glyphsLib 6.9.5
+    # https://github.com/googlefonts/fontmake/pull/1133
+    (fetchpatch2 {
+      url = "https://github.com/googlefonts/fontmake/commit/ca96d25faa67638930ddc7f9bd1ab218a76caf22.patch";
+      includes = [ "tests/test_main.py" ];
+      hash = "sha256-vz+KeWiGCpUdX5HaXDdyyUCbuMkIylB364j6cD7xR1E=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm