From a201bcf5cf8e8cab97c90588093a642f324b4339 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Feb 2024 19:57:26 +0100 Subject: [PATCH 1/2] python311Packages.adjusttext: refactor --- .../python-modules/adjusttext/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index d8d82edb8a31..e3e1bb6ac71a 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -4,27 +4,34 @@ , matplotlib , numpy , packaging +, pythonOlder +, scipy +, setuptools }: buildPythonPackage rec { pname = "adjusttext"; version = "0.8.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Phlya"; - repo = pname; + repo = "adjusttext"; rev = "refs/tags/${version}"; hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; }; nativeBuildInputs = [ packaging + setuptools ]; propagatedBuildInputs = [ matplotlib numpy + scipy ]; # Project has no tests @@ -37,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Iteratively adjust text position in matplotlib plots to minimize overlaps"; homepage = "https://github.com/Phlya/adjustText"; + changelog = "https://github.com/Phlya/adjustText/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; From f143551ad32beaebb4c42439ed2f52819d61d011 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Feb 2024 19:58:41 +0100 Subject: [PATCH 2/2] python311Packages.adjusttext: 0.8.1 -> 1.0.4 Diff: https://github.com/Phlya/adjusttext/compare/refs/tags/v0.8.1...v1.0.4 Changelog: https://github.com/Phlya/adjustText/releases/tag/v1.0.4 --- pkgs/development/python-modules/adjusttext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index e3e1bb6ac71a..a97353baa987 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.8.1"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Phlya"; repo = "adjusttext"; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; };