From 97896bbe0b03bafb2e07082c15afec5eb5467447 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 1/5] python312Packages.niapy: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/niapy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 67a1937bd016..2550bcc78ac9 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; tag = "v${version}"; - hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo="; + hash = "sha256-8hKT0WxnJijm22w4DkzicvtikaTL/mL3VhQX/WVHL58="; }; build-system = [ poetry-core ]; @@ -35,6 +35,10 @@ buildPythonPackage rec { pandas ]; + pythonRelaxDeps = [ + "numpy" + ]; + nativeCheckInputs = [ pytest7CheckHook pytest-xdist From b6e9cdb1d74e2c4c749e9bb9a367fe97ca07c2a6 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 2/5] python312Packages.niaarm: fix Numpy 2 upgrade --- pkgs/development/python-modules/niaarm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 2baf8ed356cc..0f96ca82471d 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; }; - pythonRelaxDeps = [ "scikit-learn" ]; + pythonRelaxDeps = [ + "numpy" + "scikit-learn" + ]; nativeBuildInputs = [ poetry-core ]; From 2bf736f3c3d46f76e493e89d7ed149928cafda4b Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 3/5] python312Packages.niaaml: allow Numpy 2 --- pkgs/development/python-modules/niaaml/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index a74b1ccef1ff..f0f1d6db0d77 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE="; }; - pythonRelaxDeps = [ "pandas" ]; + pythonRelaxDeps = [ + "numpy" + "pandas" + ]; nativeBuildInputs = [ poetry-core From 7c2b4aa9446648b3d83f981defaac92bcd851f26 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 4/5] python312Packages.niaclass: allow Numpy 2 --- pkgs/development/python-modules/niaclass/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index f526c2d5f58b..aeb0b7099110 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -26,7 +26,10 @@ buildPythonPackage rec { hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I="; }; - pythonRelaxDeps = [ "pandas" ]; + pythonRelaxDeps = [ + "numpy" + "pandas" + ]; nativeBuildInputs = [ poetry-core From 1d72ee6de97b3b892ea16283eac86802cb3915d3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 5/5] python312Packages.nianet: allow Numpy 2 --- pkgs/development/python-modules/nianet/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix index 5a9ca788238e..bcdcb08bb9df 100644 --- a/pkgs/development/python-modules/nianet/default.nix +++ b/pkgs/development/python-modules/nianet/default.nix @@ -27,18 +27,22 @@ buildPythonPackage rec { sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY="; }; - nativeBuildInputs = [ + build-system = [ poetry-core toml-adapt ]; - propagatedBuildInputs = [ + dependencies = [ niapy numpy scikit-learn torch ]; + pythonRelaxDeps = [ + "numpy" + ]; + # create niapy and torch dep version consistent preBuild = '' toml-adapt -path pyproject.toml -a change -dep niapy -ver X