Merge pull request #1709 from TyberiusPrime/numpy2

overrides: numpy 2
nix-community · Jun 20, 2024 · 5392004 · 5392004
2 parents 48e7ed4 + e9fa5b5
commit 5392004
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/overrides/build-systems.json b/overrides/build-systems.json
@@ -14162,6 +14162,10 @@
     {
       "buildSystem": "cython",
       "from": "1.26.0"
+    },
+    {
+      "buildSystem": "meson-python",
+      "from": "2.0.0"
     }
   ],
   "numpy-financial": [

diff --git a/overrides/default.nix b/overrides/default.nix
@@ -1783,7 +1783,10 @@ lib.composeManyExtensions [
           # fails to build with format=pyproject and setuptools >= 65
           format =
             if ((old.format or null) == "poetry2nix") then
-              "setuptools"
+              (if lib.versionAtLeast prev.numpy.version "2.0.0" then
+                 "pyproject"
+               else "setuptools"
+            )
             else
               old.format or null;
           nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ gfortran ];