diff --git a/srcpkgs/python3-scipy/patches/dep-versions.patch b/srcpkgs/python3-scipy/patches/dep-versions.patch new file mode 100644 index 00000000000..863c5e19d6d --- /dev/null +++ b/srcpkgs/python3-scipy/patches/dep-versions.patch @@ -0,0 +1,25 @@ +Several dependencies have needlessly restrictive version requirements, which +causes build failures against more up-to-date Void packages. + +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -11,8 +11,8 @@ + build-backend = 'mesonpy' + requires = [ + "meson-python>=0.12.1,<0.14.0", # already working with 0.13.x series at branch time +- "Cython>=0.29.35,<3.0", # when updating version, also update check in meson.build +- "pybind11>=2.10.4,<2.11.0", ++ "Cython>=0.29.35", # when updating version, also update check in meson.build ++ "pybind11>=2.10.4", + "pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time + # `wheel` is needed for non-isolated builds, given that `meson-python` + # doesn't list it as a runtime requirement (at least in 0.5.0) +@@ -40,7 +40,7 @@ + # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6 + # (see oldest-supported-numpy issues gh-28 and gh-45) + "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'", +- "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", ++ "numpy>=1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", + + # For Python versions which aren't yet officially supported, + # we specify an unpinned NumPy which allows source distributions diff --git a/srcpkgs/python3-scipy/patches/numpy-version.patch b/srcpkgs/python3-scipy/patches/numpy-version.patch deleted file mode 100644 index 74f9b4a919b..00000000000 --- a/srcpkgs/python3-scipy/patches/numpy-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -There doesn't seem to be a valid reason for this restriction, and it doesn't -impede building anyway. - ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -40,7 +40,7 @@ - # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6 - # (see oldest-supported-numpy issues gh-28 and gh-45) - "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'", -- "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", -+ "numpy>=1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", - - # For Python versions which aren't yet officially supported, - # we specify an unpinned NumPy which allows source distributions