From 2bd21c7bb559c410c785b729f8c9a1016ec276ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 24 Aug 2017 17:04:15 +0200
Subject: [PATCH 1/3] automatically removed whitespace as per .editorconfig

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c52732be98..56f915f372d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5460,7 +5460,7 @@ in {
   };
 
   easydict = callPackage ../development/python-modules/easydict { };
-  
+
   EasyProcess = buildPythonPackage rec {
     name = "EasyProcess-0.2.3";
 
@@ -7289,17 +7289,17 @@ in {
   logfury = buildPythonPackage rec {
     name = "logfury-${version}";
     version = "0.1.2";
-  
+
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/logfury/${name}.tar.gz";
       sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
     };
-  
+
     buildInputs =
       [ self.funcsigs
         self.six
       ];
-  
+
     meta = with pkgs.stdenv.lib; {
       description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
       homepage = "https://github.com/ppolewicz/logfury";
@@ -28755,17 +28755,17 @@ EOF
 
   cymem = callPackage ../development/python-modules/cymem { };
 
-  ftfy = callPackage ../development/python-modules/ftfy { };    
+  ftfy = callPackage ../development/python-modules/ftfy { };
 
-  murmurhash = callPackage ../development/python-modules/murmurhash { };      
+  murmurhash = callPackage ../development/python-modules/murmurhash { };
+
+  plac = callPackage ../development/python-modules/plac { };
 
-  plac = callPackage ../development/python-modules/plac { };        
-  
   preshed = callPackage ../development/python-modules/preshed { };
 
-  thinc = callPackage ../development/python-modules/thinc { };  
+  thinc = callPackage ../development/python-modules/thinc { };
 
-  spacy = callPackage ../development/python-modules/spacy { };  
+  spacy = callPackage ../development/python-modules/spacy { };
 });
 
 in fix' (extends overrides packages)

From 49ab1dcc6984d27d64694ff61821fff08d52f931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 24 Aug 2017 16:07:01 +0200
Subject: [PATCH 2/3] pythonPackages.matrix-client: init at 0.0.6

---
 .../python-modules/matrix-client/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/matrix-client/default.nix

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
new file mode 100644
index 00000000000..d0bbef8a78f
--- /dev/null
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonPackages
+}:
+
+buildPythonPackage rec {
+  pname = "matrix-client";
+  version = "0.0.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
+  };
+
+  checkInputs = with pythonPackages; [ tox pytest flake8 responses ];
+
+  propagatedBuildInputs = with pythonPackages; [ 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 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56f915f372d..d00d7f5d164 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12539,6 +12539,7 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
+  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { pythonPackages = self; };
 
   mccabe = callPackage ../development/python-modules/mccabe { };
 

From b854e83183ab92e05e8697f2f94d10aa60c59492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 12:50:41 +0100
Subject: [PATCH 3/3] pythonPackages.matrix-client: don't pass pythonPackages

---
 pkgs/development/python-modules/matrix-client/default.nix | 7 ++++---
 pkgs/top-level/python-packages.nix                        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index d0bbef8a78f..20af252f58f 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -1,7 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pythonPackages
+, requests
+, tox, pytest, flake8, responses
 }:
 
 buildPythonPackage rec {
@@ -14,9 +15,9 @@ buildPythonPackage rec {
     sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
   };
 
-  checkInputs = with pythonPackages; [ tox pytest flake8 responses ];
+  checkInputs = [ tox pytest flake8 responses ];
 
-  propagatedBuildInputs = with pythonPackages; [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   checkPhase = ''
     pytest
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d00d7f5d164..894742625b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12539,7 +12539,7 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { pythonPackages = self; };
+  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { };
 
   mccabe = callPackage ../development/python-modules/mccabe { };