Merge remote-tracking branch 'upstream/master' into HEAD

5 files changed, 207 insertions, 4 deletions

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
new file mode 100644
index 000000000000..9d09b93ed20b
--- /dev/null
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, python
+, glibcLocales
+, pkgconfig
+, gdb
+, numpy
+, ncurses
+}:
+
+buildPythonPackage rec {
+  pname = "Cython";
+  name = "${pname}-${version}";
+  version = "0.25.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
+  };
+
+  # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
+  # result is "3L" instead of "3", so let's fix it in-place.
+  #
+  # Upstream issue: https://github.com/cython/cython/issues/1548
+  postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
+    sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
+      tests/run/cpdef_enums.pyx
+  '';
+
+  buildInputs = [ glibcLocales pkgconfig gdb ];
+  # For testing
+  nativeBuildInputs = [ numpy ncurses ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  # cython's testsuite is not working very well with libc++
+  # We are however optimistic about things outside of testsuite still working
+  checkPhase = ''
+    export HOME="$NIX_BUILD_TOP"
+    ${python.interpreter} runtests.py \
+      ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""}
+  '';
+
+  # Disable tests temporarily
+  # https://github.com/cython/cython/issues/1676
+  doCheck = false;
+
+  meta = {
+    description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
+    homepage = http://cython.org;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
index 7c4ef99b0a2c..1f539ef6d395 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchurl }:
 
 buildPythonPackage rec {
   pname = "amqplib";
   version = "0.6.1";
   name = "${pname}-${version}";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
+  src = fetchurl {
+    url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz;
+    sha256 = "04nsn68wz9m24rvbssirkyighazbn20j60wjmi0r7jcpcf00sb3s";
   };
 
   # error: invalid command 'test'
diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix
new file mode 100644
index 000000000000..017b85cacc7c
--- /dev/null
+++ b/pkgs/development/python-modules/blaze/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, pytest
+, contextlib2
+, cytoolz
+, dask
+, datashape
+, flask
+, flask-cors
+, h5py
+, multipledispatch
+, numba
+, numpy
+, odo
+, pandas
+, psutil
+, pymongo
+, pyyaml
+, requests
+, sqlalchemy
+, tables
+, toolz
+}:
+
+buildPythonPackage rec {
+  pname = "blaze";
+  version = "0.11.0";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
+    sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [
+    contextlib2
+    cytoolz
+    dask
+    datashape
+    flask
+    flask-cors
+    h5py
+    multipledispatch
+    numba
+    numpy
+    odo
+    pandas
+    psutil
+    pymongo
+    pyyaml
+    requests
+    sqlalchemy
+    tables
+    toolz
+  ];
+
+  # Failing test
+  # ERROR collecting blaze/tests/test_interactive.py
+  # E   networkx.exception.NetworkXNoPath: node <class 'list'> not
+  # reachable from <class 'dask.array.core.Array'>
+  doCheck = false;
+
+  checkPhase = ''
+    py.test blaze/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/blaze;
+    description = "Allows Python users a familiar interface to query data living in other data storage systems";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix
new file mode 100644
index 000000000000..e182f55cdc00
--- /dev/null
+++ b/pkgs/development/python-modules/cycler/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, coverage
+, nose
+, six
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "cycler";
+  name = "${pname}-${version}";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8";
+  };
+
+  checkInputs = [ coverage nose ];
+  propagatedBuildInputs = [ six ];
+
+  checkPhase = ''
+    ${python.interpreter} run_tests.py
+  '';
+
+  # Tests were not included in release.
+  # https://github.com/matplotlib/cycler/issues/31
+  doCheck = false;
+
+  meta = {
+    description = "Composable style cycles";
+    homepage = http://github.com/matplotlib/cycler;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
new file mode 100644
index 000000000000..0413366c5501
--- /dev/null
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cffi
+, numpy
+, portaudio
+}:
+
+buildPythonPackage rec {
+  pname = "sounddevice";
+  name = "${pname}-${version}";
+  version = "0.3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dc5ec8534c3831ab133c497721f3aaeed4f5084b0eda842f0c0ada09f2f066dc";
+  };
+
+  propagatedBuildInputs = [ cffi numpy portaudio ];
+
+  # No tests included nor upstream available.
+  doCheck = false;
+
+  prePatch = ''
+    substituteInPlace sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'"
+  '';
+
+  meta = {
+    description = "Play and Record Sound with Python";
+    homepage = http://python-sounddevice.rtfd.org/;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file