summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-11-12 20:51:47 +0100
committerDomen Kožar <domen@dev.si>2015-11-12 20:51:47 +0100
commit6f4d790d85441481e28e80ad8fd12cbca1970fd4 (patch)
treeb1e302d36b6548104a31626639801aa232bca1ef /pkgs
parent95396d9dbbe9c52968bacf3821eccaead6081ec8 (diff)
parent00a1c28c4583029b59894181147eeca65091af69 (diff)
downloadnixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.tar
nixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.tar.gz
nixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.tar.bz2
nixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.tar.lz
nixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.tar.xz
nixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.tar.zst
nixlib-6f4d790d85441481e28e80ad8fd12cbca1970fd4.zip
Merge pull request #10982 from FRidh/python
python: updates and new munch package
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/python-packages.nix32
1 files changed, 26 insertions, 6 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1fae6fdf4c63..aa3092983667 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1467,22 +1467,26 @@ let
 
   blaze = buildPythonPackage rec {
     name = "blaze-${version}";
-    version = "0.8.2";
+    version = "0.8.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
-      sha256 = "1abedabf2a1e62dd059e0942d60f27337763de26f5e3f61ed55baaf97723b624";
+      sha256 = "4f8ceb1248ba44f833f5a46a18b6ea44130a5999d5234324d0456b5f9ffe716b";
     };
 
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [
       numpy
       pandas
       datashape
       odo
       toolz
+      cytoolz
       multipledispatch
       sqlalchemy9 # sqlalchemy8 should also work
       psutil
+      numba
+      h5py
     ];
 
     meta = {
@@ -8778,13 +8782,13 @@ let
 
   llvmlite = buildPythonPackage rec {
     name = "llvmlite-${version}";
-    version = "0.7.0";
+    version = "0.8.0";
 
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/l/llvmlite/${name}.tar.gz";
-      sha256 = "6d780980da05d2d82465991bce42c1b4625018d67feae17c672c6a9d5ad0bb1a";
+      sha256 = "a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c";
     };
 
     llvm = pkgs.llvm;
@@ -9218,6 +9222,22 @@ let
     };
   };
 
+  munch = buildPythonPackage rec {
+    name = "munch-${version}";
+    version = "2.0.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/munch/${name}.tar.gz";
+      sha256 = "1420683a94f3a2ffc77935ddd28aa9ccb540dd02b75e02ed7ea863db437ab8b2";
+    };
+
+    meta = {
+      description = "A dot-accessible dictionary (a la JavaScript objects)";
+      license = licenses.mit;
+      homepage = http://github.com/Infinidat/munch;
+    };
+  };
+
   nototools = buildPythonPackage rec {
     version = "git-2015-09-16";
     name = "nototools-${version}";
@@ -10296,12 +10316,12 @@ let
   };
 
   numba = buildPythonPackage rec {
-    version = "0.21.0";
+    version = "0.22.1";
     name = "numba-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/numba/${name}.tar.gz";
-      sha256 = "1806d2f6ad49ad891e9ac6fed0cc0b0489cbfcd9ba2dc81081c1c30091e77604";
+      sha256 = "8194c41cdf96c16e3b3d246c0381daf4e587d1ada761f410efecb8315c2cdda3";
     };
 
     propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch;