From ca29761ef5bc38947d9048b6dc8f3e8c795b6a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 9 Mar 2023 01:29:16 +0100 Subject: [PATCH] gitlint: 0.18.0 -> 0.19.0 --- .../version-management/gitlint/default.nix | 23 ++++++++++++------- .../gitlint/dont-try-to-use-git.diff | 14 +++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/version-management/gitlint/dont-try-to-use-git.diff diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index 6adb5bdc7a3f..d32de426fefa 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -7,19 +7,32 @@ python3.pkgs.buildPythonApplication rec { pname = "gitlint"; - version = "0.18.0"; + version = "0.19.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; rev = "v${version}"; - sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8="; + sha256 = "sha256-w4v6mcjCX0V3Mj1K23ErpXdyEKQcA4vykns7UwNBEZ4="; }; + patches = [ + # otherwise hatch tries to run git to collect some metadata about the build + ./dont-try-to-use-git.diff + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + # Upstream splitted the project into gitlint and gitlint-core to # simplify the dependency handling sourceRoot = "source/gitlint-core"; + nativeBuildInputs = with python3.pkgs; [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = with python3.pkgs; [ arrow click @@ -31,12 +44,6 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - postPatch = '' - # We don't need gitlint-core - substituteInPlace setup.py \ - --replace "'gitlint-core[trusted-deps]==' + version," "" - ''; - pythonImportsCheck = [ "gitlint" ]; diff --git a/pkgs/applications/version-management/gitlint/dont-try-to-use-git.diff b/pkgs/applications/version-management/gitlint/dont-try-to-use-git.diff new file mode 100644 index 000000000000..4d52cb57736f --- /dev/null +++ b/pkgs/applications/version-management/gitlint/dont-try-to-use-git.diff @@ -0,0 +1,14 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -61,10 +63,3 @@ include = [ + exclude = [ + "/gitlint/tests", # + ] +- +-[tool.hatch.metadata.hooks.vcs.urls] +-Homepage = "https://jorisroovers.github.io/gitlint" +-Documentation = "https://jorisroovers.github.io/gitlint" +-Source = "https://github.com/jorisroovers/gitlint/tree/main/gitlint-core" +-Changelog = "https://github.com/jorisroovers/gitlint/blob/main/CHANGELOG.md" +-'Source Commit' = "https://github.com/jorisroovers/gitlint/tree/{commit_hash}/gitlint-core" +\ No newline at end of file