From 50c1d0a20e6c503f968bb7c857370b38b5743006 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 10:39:41 +0100
Subject: [PATCH 1/5] python310Packages.persim: disable failing test

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

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 5c517231ec91..adbfda8a4797 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
+    hash = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
   };
 
   propagatedBuildInputs = [
@@ -61,13 +61,15 @@ buildPythonPackage rec {
     "test_mixed_pairs"
     "test_multiple_diagrams"
     "test_n_pixels"
+    # https://github.com/scikit-tda/persim/issues/67
+    "test_persistenceimager"
   ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "Distances and representations of persistence diagrams";
     homepage = "https://persim.scikit-tda.org";
     license = licenses.mit;
     maintainers = with maintainers; [ costrouc ];
+    broken = stdenv.isDarwin;
   };
 }

From f2429d995e49bcce7fe55734044bd96c1c4b8219 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 11:00:36 +0100
Subject: [PATCH 2/5] python310Packages.ripser: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix
index 61e340057a99..fa1364d5c3c6 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/pkgs/development/python-modules/ripser/default.nix
@@ -47,6 +47,10 @@ buildPythonPackage rec {
     echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
   '';
 
+  pythonImportsCheck = [
+    "ripser"
+  ];
+
   meta = with lib; {
     description = "A Lean Persistent Homology Library for Python";
     homepage = "https://ripser.scikit-tda.org";

From ae3253f3d60401d550542b5551b140f4f9bf5695 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 11:10:23 +0100
Subject: [PATCH 3/5] python310Packages.ripser: add changelog to meta

---
 pkgs/development/python-modules/ripser/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix
index fa1364d5c3c6..b79f98c1df71 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/pkgs/development/python-modules/ripser/default.nix
@@ -54,7 +54,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A Lean Persistent Homology Library for Python";
     homepage = "https://ripser.scikit-tda.org";
+    changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 6930c33c194fd613bd9f3f846d9649c3da0afce6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 11:12:46 +0100
Subject: [PATCH 4/5] python310Packages.ripser: move cython to
 nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix
index b79f98c1df71..9b22d538d554 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/pkgs/development/python-modules/ripser/default.nix
@@ -14,11 +14,13 @@
 buildPythonPackage rec {
   pname = "ripser";
   version = "0.6.1";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd";
+    hash = "sha256-M1ESoPlFMsy+aG23gm7o0HFLMvZYkav5LAoC88sPxf0=";
   };
 
   patches = [
@@ -28,8 +30,11 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  nativeBuildInputs = [
     cython
+  ];
+
+  propagatedBuildInputs = [
     numpy
     scipy
     scikit-learn

From 4a5739ad37cc306fabd76f1433e7620d8db15bdb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 11:13:47 +0100
Subject: [PATCH 5/5] python310Packages.ripser: 0.6.1 -> 0.6.4

Changelog: https://github.com/scikit-tda/ripser.py/blob/0.6.4/CHANGELOG.md
---
 .../python-modules/ripser/default.nix         | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix
index 9b22d538d554..a82d4107ceb3 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/pkgs/development/python-modules/ripser/default.nix
@@ -1,35 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchpatch
-, fetchPypi
-, pythonOlder
 , cython
+, fetchPypi
 , numpy
-, scipy
-, scikit-learn
 , persim
 , pytestCheckHook
+, pythonOlder
+, scikit-learn
+, scipy
 }:
 
 buildPythonPackage rec {
   pname = "ripser";
-  version = "0.6.1";
+  version = "0.6.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-M1ESoPlFMsy+aG23gm7o0HFLMvZYkav5LAoC88sPxf0=";
+    hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/scikit-tda/ripser.py/commit/4baa248994cee9a65d710fac91809bad8ed4e5f1.patch";
-      sha256 = "sha256-J/nxMOGOUiBueojJrUlAaXwktHDploYG/XL8/siF2kY=";
-    })
-  ];
-
   nativeBuildInputs = [
     cython
   ];