From 36598b714f47df19575a9e3ab481a8bb26f66577 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 05:10:35 +0000 Subject: [PATCH 1/2] python312Packages.kmapper: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/kmapper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index dff908bf00e0..21ee471539b9 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "kmapper"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "scikit-tda"; repo = "kepler-mapper"; - rev = "v${version}"; - sha256 = "1jqqrn7ig9kylcc8xbslxmchzghr9jgffaab3g3y3nyghk8azlgj"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-i909J0yI8v8BqGbCkcjBAdA02Io+qpILdDkojZj0wv4="; }; propagatedBuildInputs = [ From 408d5fa30b310a493e991d8b4b1f62361963ffee Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 15:11:28 +0900 Subject: [PATCH 2/2] python312Packages.kmapper: fix build --- pkgs/development/python-modules/kmapper/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 21ee471539b9..2732efae80fd 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, scikit-learn, numpy, scipy, @@ -17,22 +18,26 @@ buildPythonPackage rec { pname = "kmapper"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "scikit-tda"; repo = "kepler-mapper"; rev = "refs/tags/v${version}"; - sha256 = "sha256-i909J0yI8v8BqGbCkcjBAdA02Io+qpILdDkojZj0wv4="; + hash = "sha256-i909J0yI8v8BqGbCkcjBAdA02Io+qpILdDkojZj0wv4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ scikit-learn numpy scipy jinja2 ]; + pythonImportsCheck = [ "kmapper" ]; + nativeCheckInputs = [ pytestCheckHook networkx @@ -47,6 +52,5 @@ buildPythonPackage rec { homepage = "https://kepler-mapper.scikit-tda.org/"; license = licenses.mit; maintainers = [ ]; - broken = true; }; }