From 9fe3c868a7df9ae56008848dced802b0e1dce0dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 1 Sep 2024 17:33:01 -0700
Subject: [PATCH 1/2] Revert "python312Packages.numba: use a single numpy
 version; don't propagate it"

This reverts commit 3bad18825ec132da9f34a41f37cc28e26084862e.
Numba doesn't work without NumPy and it's in upstream's setup_requires
as well as install_requires.
---
 pkgs/development/python-modules/numba/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index eec0c6a83a28..9d6e7ff27bd5 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -7,6 +7,7 @@
   python,
   buildPythonPackage,
   setuptools,
+  numpy,
   numpy_2,
   llvmlite,
   libcxx,
@@ -81,6 +82,7 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
+    numpy_2
   ];
 
   nativeBuildInputs = lib.optionals cudaSupport [
@@ -88,12 +90,10 @@ buildPythonPackage rec {
     cudaPackages.cuda_nvcc
   ];
 
-  buildInputs = [
-    # Not propagating it, because it numba can work with either numpy_2 or numpy_1
-    numpy_2
-  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];
+  buildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];
 
   dependencies = [
+    numpy
     llvmlite
     setuptools
   ] ++ lib.optionals (pythonOlder "3.9") [ importlib-metadata ];

From 2e51284167774ad2465ce9a670a094cf404ca12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 1 Sep 2024 17:54:47 -0700
Subject: [PATCH 2/2] python312Packages.numba: only use numpy_2 in
 passthru.tests

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 9d6e7ff27bd5..10f622b37722 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -82,7 +82,7 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    numpy_2
+    numpy
   ];
 
   nativeBuildInputs = lib.optionals cudaSupport [
@@ -161,6 +161,9 @@ buildPythonPackage rec {
       doFullCheck = true;
       testsWithoutSandbox = false;
     };
+    numpy_2 = numba.override {
+      numpy = numpy_2;
+    };
   };
 
   meta = with lib; {