From 3a960c1f5e98448b9d41c9ade2a4185e2f5f0dc0 Mon Sep 17 00:00:00 2001 From: Robin Quintero Date: Tue, 19 Mar 2024 14:21:52 -0500 Subject: [PATCH] feat(back): #1314 upgrade lint-git-mailmap - Upgrade to the latest version of mailmap-linter - Add a `exclude` option to the lint-git-mailmap module - Add a `--exclude` option to the entrypoint script - Update documentation Signed-off-by: Robin Quintero --- docs/src/api/builtins/lint.md | 5 +++++ src/args/lint-git-mailmap/default.nix | 6 ++++-- src/args/lint-git-mailmap/entrypoint.sh | 2 +- src/evaluator/modules/lint-git-mailmap/default.nix | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/src/api/builtins/lint.md b/docs/src/api/builtins/lint.md index 28d2cc04..9d95c6f8 100644 --- a/docs/src/api/builtins/lint.md +++ b/docs/src/api/builtins/lint.md @@ -130,6 +130,10 @@ Types: - lintGitMailmap: - enable (`boolean`): Optional. Defaults to `false`. + - exclude (`str`): Optional. + If the excludes aren't too many then use `exclude` instead + of the exclude file (`.mailmap-exclude`). + Defaults to `^$`. Example: @@ -139,6 +143,7 @@ Example: { lintGitMailMap = { enable = true; + exclude = "^.* <.*noreply@github.com>$"; }; } ``` diff --git a/src/args/lint-git-mailmap/default.nix b/src/args/lint-git-mailmap/default.nix index 15808e8e..b9d51fc8 100644 --- a/src/args/lint-git-mailmap/default.nix +++ b/src/args/lint-git-mailmap/default.nix @@ -6,18 +6,20 @@ }: { name, src, + exclude, }: let mailmapLinter = fetchGithub { owner = "kamadorueda"; repo = "mailmap-linter"; - rev = "a51ac7e44515c754938a08f81038762e7d09a827"; - sha256 = "1da49y2cw9g9i4gbd2ykqghnpqpqdac18lafmn878qdlf1v8n9lh"; + rev = "ffed6a68e507228d7e462642a8ec129f816b6a5d"; + sha256 = "XHmqLTT7TZ/dXBtQSH1xkEGSWI4mpImt+KRqBHbfGLk="; }; in makeScript { entrypoint = ./entrypoint.sh; replace = { __argSrc__ = src; + __argExclude__ = exclude; }; name = "lint-git-mailmap-for-${name}"; searchPaths = { diff --git a/src/args/lint-git-mailmap/entrypoint.sh b/src/args/lint-git-mailmap/entrypoint.sh index ac346de5..53f25390 100644 --- a/src/args/lint-git-mailmap/entrypoint.sh +++ b/src/args/lint-git-mailmap/entrypoint.sh @@ -2,7 +2,7 @@ function main { cd '__argSrc__' \ - && mailmap-linter + && mailmap-linter --exclude '__argExclude__' } main "${@}" diff --git a/src/evaluator/modules/lint-git-mailmap/default.nix b/src/evaluator/modules/lint-git-mailmap/default.nix index c408bc7e..4aa11fd1 100644 --- a/src/evaluator/modules/lint-git-mailmap/default.nix +++ b/src/evaluator/modules/lint-git-mailmap/default.nix @@ -9,6 +9,10 @@ default = false; type = lib.types.bool; }; + exclude = lib.mkOption { + default = "^$"; + type = lib.types.str; + }; }; }; config = { @@ -19,6 +23,7 @@ (lintGitMailMap { name = "lint-git-mailmap"; src = "."; + exclude = config.lintGitMailMap.exclude; }); }; };