From 827ce2d1f7dd3b54819ade3ef2a99d1923cd036e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 07:35:03 +0000 Subject: [PATCH 1/3] python312Packages.gekko: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/gekko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index 94d07a88b595..49ea88b90c09 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "gekko"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dImIf5zR6SCztgrFbaRrz4nLl1ZzJIyPLDNGIVLoOdg="; + hash = "sha256-xc6NfPCvkEYjUG82QmFqDuu02QNwKfoS6DDpkdaMWJ8="; }; nativeBuildInputs = [ From a726656b84a4cdd3f8ed986bb92742f013596805 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 10:37:02 +0200 Subject: [PATCH 2/3] python312Packages.gekko: refactor --- .../python-modules/gekko/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index 49ea88b90c09..745898f8992d 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -1,35 +1,40 @@ -{ fetchPypi -, lib +{ lib , buildPythonPackage -, setuptools +, fetchPypi , numpy -, wheel -, +, pythonOlder +, setuptools }: + buildPythonPackage rec { pname = "gekko"; version = "1.1.1"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-xc6NfPCvkEYjUG82QmFqDuu02QNwKfoS6DDpkdaMWJ8="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - pythonImportsCheck = [ "gekko" ]; - - propagatedBuildInputs = [ + dependencies = [ numpy ]; + # Module has no tests + doCHeck = false; + + pythonImportsCheck = [ "gekko" ]; + meta = with lib; { + description = "Module for machine learning and optimization"; homepage = "https://github.com/BYU-PRISM/GEKKO"; - description = "A Python package for machine learning and optimization"; + changelog = "https://github.com/BYU-PRISM/GEKKO/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ayes-web ]; }; From 84a50dcf5260ead5cb65bbf5f66cfd69095155ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 10:37:18 +0200 Subject: [PATCH 3/3] python312Packages.gekko: format with nixfmt --- .../python-modules/gekko/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index 745898f8992d..24fd7423b8c3 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + numpy, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -18,13 +19,9 @@ buildPythonPackage rec { hash = "sha256-xc6NfPCvkEYjUG82QmFqDuu02QNwKfoS6DDpkdaMWJ8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - numpy - ]; + dependencies = [ numpy ]; # Module has no tests doCHeck = false;