From 0d54f987daa30407e127ee9cc1fd4af8b406aef9 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:39:02 +1000
Subject: [PATCH 1/4] pythonPackages.nimfa: init at 1.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10705d02d6b..8f8672e4ec8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11343,6 +11343,28 @@ in {
 
   nilearn = callPackage ../development/python-modules/nilearn {};
 
+  nimfa = buildPythonPackage rec {
+    pname = "nimfa";
+    version = "1.3.1";
+    name = "${pname}-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/n/${pname}/${name}.tar.gz";
+      sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5";
+    };
+
+    propagatedBuildInputs = with self; [ numpy scipy ];
+    buildInputs = with self; [ matplotlib pytest ];
+    doCheck = false; # errors
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Nonnegative matrix factorization library";
+      homepage = "http://nimfa.biolab.si";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ ashgillman ];
+    };
+  };
+
   nipy = buildPythonPackage rec {
     version = "0.4.0";
     name = "nipy-${version}";

From b9e126d2d1396e90389fee80b9905fc1f28d6d38 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 18:55:56 +1000
Subject: [PATCH 2/4] pythonPackages.nimfa: Move to own file.

---
 .../python-modules/nimfa/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +-------------
 2 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/nimfa/default.nix

diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix
new file mode 100644
index 00000000000..87f7755fcf2
--- /dev/null
+++ b/pkgs/development/python-modules/nimfa/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, scipy
+, matplotlib
+, pytest
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "nimfa";
+  version = "1.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5";
+  };
+
+  propagatedBuildInputs = [ numpy scipy ];
+  buildInputs = [ matplotlib pytest ];
+  doCheck = false; # errors
+
+  meta = with stdenv.lib; {
+    description = "Nonnegative matrix factorization library";
+    homepage = "http://nimfa.biolab.si";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ashgillman ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f8672e4ec8..1670655e686 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11343,27 +11343,7 @@ in {
 
   nilearn = callPackage ../development/python-modules/nilearn {};
 
-  nimfa = buildPythonPackage rec {
-    pname = "nimfa";
-    version = "1.3.1";
-    name = "${pname}-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/${pname}/${name}.tar.gz";
-      sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5";
-    };
-
-    propagatedBuildInputs = with self; [ numpy scipy ];
-    buildInputs = with self; [ matplotlib pytest ];
-    doCheck = false; # errors
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Nonnegative matrix factorization library";
-      homepage = "http://nimfa.biolab.si";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ ashgillman ];
-    };
-  };
+  nimfa = callPackage ../development/python-modules/nimfa {};
 
   nipy = buildPythonPackage rec {
     version = "0.4.0";

From b6d615ff7e8664bd5900517a95ad4639c7cf99c1 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Wed, 17 Jan 2018 10:56:19 +1000
Subject: [PATCH 3/4] pythonPackages.nimfa: Follow conventions.

---
 pkgs/development/python-modules/nimfa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix
index 87f7755fcf2..cfe7180fac2 100644
--- a/pkgs/development/python-modules/nimfa/default.nix
+++ b/pkgs/development/python-modules/nimfa/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 , numpy
 , scipy
 , matplotlib
@@ -8,7 +9,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "nimfa";
   version = "1.3.1";
 
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ numpy scipy ];
-  buildInputs = [ matplotlib pytest ];
-  doCheck = false; # errors
+  checkInputs = [ matplotlib pytest ];
+  doCheck = !isPy3k;  # https://github.com/marinkaz/nimfa/issues/42
 
   meta = with stdenv.lib; {
     description = "Nonnegative matrix factorization library";

From 4c990112145003ec62de4eda5b444372c2a7ee2d Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Wed, 17 Jan 2018 10:57:35 +1000
Subject: [PATCH 4/4] pythonPackages.nimfa: 1.3.1 -> 1.3.2

---
 pkgs/development/python-modules/nimfa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix
index cfe7180fac2..b38aea7d28c 100644
--- a/pkgs/development/python-modules/nimfa/default.nix
+++ b/pkgs/development/python-modules/nimfa/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "nimfa";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05d0m5n96bg6wj94r7m1har48f93797gk5v9s62zdv7x83a6n6j5";
+    sha256 = "0iqcrr48jwy7nh8g13xf4rvpw9wq5qs3hyd6gqlh30mgyn9i85w7";
   };
 
   propagatedBuildInputs = [ numpy scipy ];