Merge branch 'staging'

A security update of libxml2 is within.

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

@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.14.0";
+  version = "0.15.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8";
+    sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
@@ -47,4 +47,4 @@ buildPythonPackage rec {
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ fridh ];
   };
-}
+}

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

@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.29.0";
+  version = "0.30.1";
   name = "numba-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d";
+    sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@@ -28,8 +28,7 @@ buildPythonPackage rec {
 
   # 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
+    python -m numba.runtests
   '';
   # ImportError: cannot import name '_typeconv'
   doCheck = false;
@@ -40,4 +39,4 @@ buildPythonPackage rec {
     description = "Compiling Python code using LLVM";
     maintainers = with stdenv.lib.maintainers; [ fridh ];
   };
-}
+}