From bab178e0a38763f44187d3e6ea91c906a624377b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 17:11:27 +0000 Subject: [PATCH 1/2] python312Packages.pygmt: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/pygmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index c48234d706cae..a584aeabd5b25 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; tag = "v${version}"; - hash = "sha256-DO9KUlmt5EV+ioOSQ/BOcx4pP409f94dzmFwqK2MwMY="; + hash = "sha256-8dzZuv9feiRyh3l8wV6+gYvc6N+yQnabgSbvw4ig+GY="; }; postPatch = '' From 4dd3edece448c13d438aad6d8e952d64c8f5f660 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 10 Jan 2025 22:03:01 +0400 Subject: [PATCH 2/2] python312Packages.pygmt: modernize --- pkgs/development/python-modules/pygmt/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a584aeabd5b25..3152281b06566 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "GenericMappingTools"; @@ -35,9 +35,9 @@ buildPythonPackage rec { --replace-fail "env.get(\"GMT_LIBRARY_PATH\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ numpy netcdf4 pandas @@ -61,11 +61,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygmt" ]; - meta = with lib; { + meta = { description = "Python interface for the Generic Mapping Tools"; homepage = "https://github.com/GenericMappingTools/pygmt"; - license = licenses.bsd3; + license = lib.licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - maintainers = with maintainers; teams.geospatial.members; + maintainers = lib.teams.geospatial.members; }; }