Merge branch 'master' into staging

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

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "amqplib";
+  version = "0.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/py-amqplib/;
+    description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
+  };
+}

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

@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest }:
+
+buildPythonPackage rec {
+  pname = "apipkg";
+  version = "1.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Namespace control and lazy-import mechanism";
+    homepage = "http://bitbucket.org/hpk42/apipkg";
+    license = licenses.mit;
+  };
+}

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

@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl
+, sqlite, isPyPy }:
+
+buildPythonPackage rec {
+  pname = "apsw";
+  version = "3.7.6.2-r1";
+  name = "${pname}-${version}";
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "http://apsw.googlecode.com/files/${name}.zip";
+    sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
+  };
+
+  buildInputs = [ sqlite ];
+
+  # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A Python wrapper for the SQLite embedded relational database engine";
+    homepage = http://code.google.com/p/apsw/;
+  };
+}

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

@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, boto }:
+
+buildPythonPackage rec {
+  pname = "Area53";
+  version = "0.94";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  propagatedBuildInputs = [ boto ];
+}

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

@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "args";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Command Arguments for Humans";
+    homepage = "https://github.com/kennethreitz/args";
+  };
+}

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, pyparsing }:
+
+buildPythonPackage rec {
+  pname = "asn1ate";
+  date = "20160810";
+  name = "${pname}-unstable-${date}";
+
+  src = fetchFromGitHub {
+    sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
+    rev = "c56104e8912400135509b584d84423ee05a5af6b";
+    owner = "kimgr";
+    repo = pname;
+  };
+
+  propagatedBuildInputs = [ pyparsing ];
+
+  meta = with stdenv.lib; {
+    description = "Python library for translating ASN.1 into other forms";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}

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

@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "astor";
+  version = "0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Library for reading, writing and rewriting python AST";
+    homepage = https://github.com/berkerpeksag/astor;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nixy ];
+  };
+}

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

@@ -0,0 +1,16 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "chai";
+  version = "1.1.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Mocking, stubbing and spying framework for python";
+  };
+}

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

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "chainmap";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
+  };
+
+  # Requires tox
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Backport/clone of ChainMap";
+    homepage = "https://bitbucket.org/jeunice/chainmap";
+    license = licenses.psfl;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/python-modules/django/1_10.nix

@@ -1,36 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl, substituteAll,
-  pythonOlder,
-  geos, gdal
-}:
-buildPythonPackage rec {
-  pname = "Django";
-  name = "${pname}-${version}";
-  version = "1.10.7";
-  disabled = pythonOlder "2.7";
-
-  src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-    sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./1.10-gis-libs.template.patch;
-      geos = geos;
-      gdal = gdal;
-    })
-  ];
-
-  # patch only $out/bin to avoid problems with starter templates (see #3134)
-  postFixup = ''
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
-  '';
-
-  # too complicated to setup
-  doCheck = false;
-
-  meta = {
-    description = "A high-level Python Web framework";
-    homepage = https://www.djangoproject.com/;
-  };
-}

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

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, unittest2 }:
+
+buildPythonPackage rec {
+  pname = "funcsigs";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
+  };
+
+  buildInputs = [ unittest2 ];
+
+  meta = with stdenv.lib; {
+    description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
+    homepage = "https://github.com/aliles/funcsigs";
+    maintainers = with maintainers; [ garbas ];
+    license = licenses.asl20;
+  };
+}

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

@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, numpy }:
+
+buildPythonPackage rec {
+  name = "hmmlearn-${version}";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+    sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Hidden Markov Models in Python with scikit-learn like API";
+    homepage    = "https://github.com/hmmlearn/hmmlearn";
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.unix;
+  };
+}

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

@@ -7,13 +7,13 @@ else
 stdenv.mkDerivation rec {
   pname = "libarcus";
   name = "${pname}-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
   
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h";
+    sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c";
   };
   
   propagatedBuildInputs = [ sip protobuf ];

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

@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
+
+buildPythonPackage rec {
+  name    = "PyChromecast-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
+    sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
+  };
+
+  propagatedBuildInputs = [ requests six zeroconf protobuf ];
+
+  meta = with lib; {
+    description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
+    homepage    = "https://github.com/balloob/pychromecast";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.linux;
+  };
+}

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

@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, numpy }:
+
+buildPythonPackage rec {
+  name = "sphfile-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+    sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Numpy-based NIST SPH audio-file reader";
+    homepage    = "https://github.com/mcfletch/sphfile";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.unix;
+  };
+}

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

@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }:
+{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }:
 
 if lib.versionOlder python.version "3.5.0"
 then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "2.4.0";
+  version = "2.6.1";
   pname = "uranium";
   name = "${pname}-${version}";
   
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il";
+    sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq";
   };
   
-  buildInputs = [ python ];
+  buildInputs = [ python gettext ];
   propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake doxygen ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt

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

@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.18.0";
+  version = "0.19.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
+    sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
   };
 
   propagatedBuildInputs = [ netifaces six enum-compat ];