From 39209e04a17427974c228c602005dc2f1e832533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Aug 2024 18:50:52 +0000 Subject: [PATCH 1/3] python312Packages.commitizen: 3.28.0 -> 3.29.0 --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 7f2870ae493c..e48a95b98bcf 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.28.0"; + version = "3.29.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Z/L8TvMoee3qB+P6HUJEQxqw3nDEbBQabQOUyx0iugw="; + hash = "sha256-7EQFip8r2Ey7Rbbwns1gvhsBOj7Hjm94NYhq8aANDIo="; }; pythonRelaxDeps = [ From 75bde306d714a93415b626d6d18c26494200e296 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 22:39:35 +0200 Subject: [PATCH 2/3] python312Packages.commitizen: format with nixfmt --- .../python-modules/commitizen/default.nix | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index e48a95b98bcf..636d6c7334b6 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -1,31 +1,32 @@ -{ lib -, commitizen -, fetchFromGitHub -, buildPythonPackage -, git -, pythonOlder -, stdenv -, installShellFiles -, poetry-core -, nix-update-script -, testers -, argcomplete -, charset-normalizer -, colorama -, decli -, importlib-metadata -, jinja2 -, packaging -, pyyaml -, questionary -, termcolor -, tomlkit -, py -, pytest-freezer -, pytest-mock -, pytest-regressions -, pytest7CheckHook -, deprecated +{ + lib, + commitizen, + fetchFromGitHub, + buildPythonPackage, + git, + pythonOlder, + stdenv, + installShellFiles, + poetry-core, + nix-update-script, + testers, + argcomplete, + charset-normalizer, + colorama, + decli, + importlib-metadata, + jinja2, + packaging, + pyyaml, + questionary, + termcolor, + tomlkit, + py, + pytest-freezer, + pytest-mock, + pytest-regressions, + pytest7CheckHook, + deprecated, }: buildPythonPackage rec { @@ -108,13 +109,12 @@ buildPythonPackage rec { let register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete"; in - lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) - '' - installShellCompletion --cmd cz \ - --bash <(${register-python-argcomplete} --shell bash $out/bin/cz) \ - --zsh <(${register-python-argcomplete} --shell zsh $out/bin/cz) \ - --fish <(${register-python-argcomplete} --shell fish $out/bin/cz) - ''; + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd cz \ + --bash <(${register-python-argcomplete} --shell bash $out/bin/cz) \ + --zsh <(${register-python-argcomplete} --shell zsh $out/bin/cz) \ + --fish <(${register-python-argcomplete} --shell fish $out/bin/cz) + ''; passthru = { updateScript = nix-update-script { }; @@ -130,6 +130,9 @@ buildPythonPackage rec { changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; license = licenses.mit; mainProgram = "cz"; - maintainers = with maintainers; [ lovesegfault anthonyroussel ]; + maintainers = with maintainers; [ + lovesegfault + anthonyroussel + ]; }; } From 29d3f0789363282cd5600cc029c3cdbd468aa2eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 22:40:44 +0200 Subject: [PATCH 3/3] python312Packages.commitizen: refactor --- .../python-modules/commitizen/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 636d6c7334b6..17e10e8c0f42 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -32,13 +32,13 @@ buildPythonPackage rec { pname = "commitizen"; version = "3.29.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "commitizen-tools"; - repo = pname; + repo = "commitizen"; rev = "refs/tags/v${version}"; hash = "sha256-7EQFip8r2Ey7Rbbwns1gvhsBOj7Hjm94NYhq8aANDIo="; }; @@ -48,12 +48,11 @@ buildPythonPackage rec { "decli" ]; - nativeBuildInputs = [ - poetry-core - installShellFiles - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ installShellFiles ]; + + dependencies = [ argcomplete charset-normalizer colorama