pythonPackages.numba: 0.27.0 -> 0.29.0

and move expression in a separate file.

2 files changed, 44 insertions, 35 deletions

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
new file mode 100644
index 000000000000..1feb9e009e27
--- /dev/null
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchurl
+, python
+, buildPythonPackage
+, isPy27
+, isPy33
+, isPy3k
+, numpy
+, llvmlite
+, argparse
+, funcsigs
+, singledispatch
+, libcxx
+}:
+
+buildPythonPackage rec {
+  version = "0.29.0";
+  name = "numba-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/n/numba/${name}.tar.gz";
+    sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d";
+  };
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+
+  propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch;
+
+  # Copy test script into $out and run the test suite.
+  checkPhase = ''
+    cp runtests.py $out/${python.sitePackages}/numba/runtests.py
+    ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py
+  '';
+  # ImportError: cannot import name '_typeconv'
+  doCheck = false;
+
+  meta =  {
+    homepage = http://numba.pydata.org/;
+    license = stdenv.lib.licenses.bsd2;
+    description = "Compiling Python code using LLVM";
+    maintainers = with stdenv.lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a579ecda325..dde6ea286727 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15734,41 +15734,7 @@ in {
     };
   };
 
-  numba = buildPythonPackage rec {
-    version = "0.27.0";
-    name = "numba-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numba/${name}.tar.gz";
-      sha256 = "5fc8069cdc839b8b44ac6c54260902f60cbd77bd027b20999970a81cce7008ba";
-    };
-
-    NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
-
-    propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch;
-    # Future work: add Cuda support.
-    #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6];
-    #buildPhase = ''
-    #  export NUMBAPRO_CUDA_DRIVER=
-    #  export NUMBAPRO_NVVM=${pkgs.cudatoolkit6}
-    #  export NUMBAPRO_LIBDEVICE=
-    #'';
-
-    # Copy test script into $out and run the test suite.
-    checkPhase = ''
-      cp runtests.py $out/${python.sitePackages}/numba/runtests.py
-      ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py
-    '';
-    # ImportError: cannot import name '_typeconv'
-    doCheck = false;
-
-    meta = {
-      homepage = http://numba.pydata.org/;
-      license = licenses.bsd2;
-      description = "Compiling Python code using LLVM";
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  numba = callPackage ../development/python-modules/numba { };
 
   numexpr = buildPythonPackage rec {
     version = "2.5.2";