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

pkgs/development/python-modules/linode-api/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions.
+  version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions.
   name = "${pname}-${version}";
 
   disabled = (pythonOlder "2.7");
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4";
+    sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4";
   };
 
   meta = {

pkgs/development/python-modules/matrix-client/default.nix

@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, requests
+, tox, pytest, flake8, responses
+}:
+
+buildPythonPackage rec {
+  pname = "matrix-client";
+  version = "0.0.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
+  };
+
+  checkInputs = [ tox pytest flake8 responses ];
+
+  propagatedBuildInputs = [ requests ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Matrix Client-Server SDK";
+    homepage = https://github.com/matrix-org/matrix-python-sdk;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olejorgenb ];
+  };
+}