From b6c5c7d2380592be8344748d5f6f78edc236c846 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Jan 2025 08:18:34 +0000 Subject: [PATCH 1/2] python312Packages.setuptools-git-versioning: 2.0.0 -> 2.1.0 --- .../python-modules/setuptools-git-versioning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index 2173f63bdcfe..1343ef340681 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "setuptools-git-versioning"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dolfinus"; repo = "setuptools-git-versioning"; tag = "v${version}"; - hash = "sha256-xugK/JOVA53nCK8bB0gPkhIREmy0+/OthsydfYRCYno="; + hash = "sha256-Slf6tq83LajdTnr98SuCiFIdm/6auzftnARLAOBgyng="; }; nativeBuildInputs = [ From 4dd98bc7f1fcaee08c467790fc7ea433dc893f60 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 18 Jan 2025 12:10:13 -0800 Subject: [PATCH 2/2] python312Packages.setuptools-git-versioning: refactor, switch to tomli toml is still needed in tests --- .../python-modules/setuptools-git-versioning/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index 1343ef340681..fb69ff6313f8 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -11,7 +11,7 @@ pythonOlder, setuptools, toml, - wheel, + tomli, }: buildPythonPackage rec { @@ -26,15 +26,14 @@ buildPythonPackage rec { hash = "sha256-Slf6tq83LajdTnr98SuCiFIdm/6auzftnARLAOBgyng="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools - ] ++ lib.optionals (pythonOlder "3.11") [ toml ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; pythonImportsCheck = [ "setuptools_git_versioning" ];