Commit 9fe3c868 authored by Robert Schütz's avatar Robert Schütz
Browse files

Revert "python312Packages.numba: use a single numpy version; don't propagate it" 

This reverts commit 3bad1882.
Numba doesn't work without NumPy and it's in upstream's setup_requires
as well as install_requires.
parent 301e2735

pkgs/development/python-modules/numba/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 ];