Revert "python312Packages.numba: use a single numpy version; don't propagate it" (#338884)
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
python,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
numpy,
|
||||
numpy_2,
|
||||
llvmlite,
|
||||
libcxx,
|
||||
@@ -81,6 +82,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
numpy
|
||||
];
|
||||
|
||||
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 ];
|
||||
@@ -161,6 +161,9 @@ buildPythonPackage rec {
|
||||
doFullCheck = true;
|
||||
testsWithoutSandbox = false;
|
||||
};
|
||||
numpy_2 = numba.override {
|
||||
numpy = numpy_2;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Reference in New Issue
Block a user