Merge branch 'master' into staging

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

@@ -3,11 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "channels";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48f97f1801e0a8da6d01430d16d4ed8bd460d4ec3130c66075fb94b12bb30a67";
+    sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd";
   };
 
   # Files are missing in the distribution

pkgs/development/python-modules/curve25519-donna/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "curve25519-donna";
+  version = "1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w0vkjyh4ki9n98lr2hg09f1lr1g3pz48kshrlic01ba6pasj60q";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python wrapper for the portable curve25519-donna implementation";
+    homepage = http://code.google.com/p/curve25519-donna/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ elseym ];
+  };
+}

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, srptools, aiohttp, zeroconf
+, ed25519, cryptography, curve25519-donna, pytest, pytestrunner
+, netifaces, asynctest, virtualenv, toml, filelock, tox }:
+
+buildPythonPackage rec {
+  pname = "pyatv";
+  version = "0.3.12";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "135xvy1nn0x5knc7l05amfs837xkx2gcg3lpp69ya9kqs8j6brgp";
+  };
+
+  propagatedBuildInputs = [ srptools aiohttp zeroconf ed25519 cryptography curve25519-donna tox ];
+
+  checkInputs = [ pytest pytestrunner netifaces asynctest virtualenv toml filelock ];
+
+  meta = with stdenv.lib; {
+    description = "A python client library for the Apple TV";
+    homepage = https://github.com/postlund/pyatv;
+    license = licenses.mit;
+    maintainers = with maintainers; [ elseym ];
+  };
+}

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

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "pybotvac";
+  version = "0.0.12";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "12qm4w883nb6fwff6sch5l133g3irqjcrgkjhh4mz1mmz7n6xzjh";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with stdenv.lib; {
+    description = "Python package for controlling Neato pybotvac Connected vacuum robot";
+    homepage = https://github.com/stianaske/pybotvac;
+    license = licenses.mit;
+    maintainers = with maintainers; [ elseym ];
+  };
+}

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

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }:
+
+buildPythonPackage rec {
+  pname = "srptools";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytest pytestrunner ];
+
+  meta = with stdenv.lib; {
+    description = "Python-Tools to implement Secure Remote Password (SRP) authentication";
+    homepage = https://github.com/idlesign/srptools;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ elseym ];
+  };
+}

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1awiglfiajnx2hva9aqpj3fmdvdb4qg7cwnlfyih827m68y3cq8v";
+    sha256 = "18lc95pmc7i089nlsb06dsxyjl5wbhxfqgdxbjcia35ndh8z7sn9";
   };
 
   postPatch = ''

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

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "1.0.2";
+  version = "1.0.3";
   disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f26e6eba6550ff1575ef2f2831fc8bc0b465f17f9757d0b6c7db55fab5702061";
+    sha256 = "0avr63rka9lrqngjfmny7hdds4klmg1nriwc7n3kgyrp44z2lk7c";
   };
 
   # fails..