From 652fe8258f7d2ab2748325faf467efe2683d9f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:25:24 -0800 Subject: [PATCH 1/2] python313Packages.flammkuchen: fix build with NumPy v2 --- .../python-modules/flammkuchen/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index 8af55dfe7c02..eabc1277fe7e 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, numpy, pandas, @@ -13,16 +14,24 @@ buildPythonPackage rec { pname = "flammkuchen"; version = "1.0.3"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-z68HBsU9J6oe8+YL4OOQiMYQRs3TZUDM+e2ssqo6BFI="; }; - nativeBuildInputs = [ setuptools ]; + patches = [ + (fetchpatch2 { + name = "numpy-v2-compat.patch"; + url = "https://github.com/portugueslab/flammkuchen/commit/c523ea78e10facd98d4893f045249c68bae17940.patch?full_index=1"; + hash = "sha256-/goNkiEBrcprywQYf2oKvGbu5j12hmalPuB45wNNt+I="; + }) + ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy tables From b39a906d9557e647f48916541440686e3a33a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 17:29:59 -0800 Subject: [PATCH 2/2] python313Packages.stytra: specify build-system --- pkgs/development/python-modules/stytra/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 5af44d463921..21520a78aaa7 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -27,6 +27,7 @@ qimage2ndarray, scikit-image, scipy, + setuptools, tables, }: @@ -46,7 +47,9 @@ buildPythonPackage rec { ./0000-workaround-pyqtgraph.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ opencv4 pyqt5 pyqtgraph