diff --git a/pkgs/development/python-modules/fst-pso/default.nix b/pkgs/development/python-modules/fst-pso/default.nix index 3096bb743d11..6deb524307de 100644 --- a/pkgs/development/python-modules/fst-pso/default.nix +++ b/pkgs/development/python-modules/fst-pso/default.nix @@ -5,21 +5,25 @@ miniful, numpy, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fst-pso"; - version = "1.8.1"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-s9FuwnsLTTazWzBq9AwAzQs05eCp4wpx7QJJDolUomo="; + pname = "fst_pso"; + inherit version; + hash = "sha256-znf1A/Vcz5ELFGFrpDzdj8O3XEDxpu+mCCb35GfWqN8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ miniful numpy ]; @@ -32,7 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Fuzzy Self-Tuning PSO global optimization library"; homepage = "https://github.com/aresio/fst-pso"; - license = with licenses; [ lgpl3Only ]; + changelog = "https://github.com/aresio/fst-pso/releases/tag/${version}"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pyfume/default.nix b/pkgs/development/python-modules/pyfume/default.nix index b79bf238d48c..e6649fb17153 100644 --- a/pkgs/development/python-modules/pyfume/default.nix +++ b/pkgs/development/python-modules/pyfume/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; pythonRelaxDeps = [ + "fst-pso" "numpy" "pandas" "scipy" @@ -50,7 +51,7 @@ buildPythonPackage rec { description = "Python package for fuzzy model estimation"; homepage = "https://github.com/CaroFuchs/pyFUME"; changelog = "https://github.com/CaroFuchs/pyFUME/releases/tag/${version}"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; }