Skip to content

Commit 34fdf24

Browse files
committed
Add warnings for changed modules
1 parent f94f8e2 commit 34fdf24

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

modules/hooks.nix

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
let
33
inherit (config) hooks tools settings;
44
cfg = config;
5-
inherit (lib) flatten mapAttrs mapAttrsToList mkDefault mkOption mkRenamedOptionModule types;
5+
inherit (lib) flatten mapAttrs mapAttrsToList mkDefault mkOption mkRemovedOptionModule mkRenamedOptionModule types;
66

77
hookModule =
88
[
@@ -33,16 +33,27 @@ in
3333
imports =
3434
# Rename `settings.<name>.package` to `hooks.<name>.package`
3535
map (name: mkRenamedOptionModule [ "settings" name "package" ] [ "hooks" name "package" ]) [ "alejandra" "eclint" "flynt" "mdl" "treefmt" ]
36-
# Manually rename options that had a package option
36+
# These options were renamed in 20fbe2c9731810b1020572a2cb6cbf64e3dd3873 to avoid shadowing
37+
++ map (name: mkRenamedOptionModule [ "settings" name "config" ] [ "hooks" name "settings" "configuration" ]) [ "lua-ls" "markdownlint" "typos" "vale" ]
38+
++ [
39+
(mkRemovedOptionModule [ "settings" "yamllint" "relaxed" ] ''
40+
This option has been removed. Use `hooks.yamllint.settings.preset = "relaxed"`.
41+
'')
42+
]
43+
# Manually rename options that had a package or a config option
3744
++ flatten (mapAttrsToList (name: map (o: mkRenamedOptionModule [ "settings" name o ] [ "hooks" name "settings" o ])) {
3845
"alejandra" = [ "check" "exclude" "threads" "verbosity" ];
3946
"eclint" = [ "fix" "summary" "color" "exclude" "verbosity" ];
4047
"flynt" = [ "aggressive" "binPath" "dry-run" "exclude" "fail-on-change" "line-length" "no-multiline" "quiet" "string" "transform-concats" "verbose" ];
4148
"mdl" = [ "configPath" "git-recurse" "ignore-front-matter" "json" "rules" "rulesets" "show-aliases" "warnings" "skip-default-ruleset" "style" "tags" "verbose" ];
49+
"lua-ls" = [ "checklevel" ];
50+
"typos" = [ "binary" "color" "configPath" "diff" "exclude" "format" "hidden" "ignored-words" "locale" "no-check-filenames" "no-check-files" "no-unicode" "quiet" "verbose" "write" ];
51+
"vale" = [ "configPath" "flags" ];
52+
"yamllint" = [ "configPath" ];
4253
})
4354
# Rename the remaining `settings.<name>` to `hooks.<name>.settings`
4455
++ map (name: mkRenamedOptionModule [ "settings" name ] [ "hooks" name "settings" ])
45-
[ "ansible-lint" "autoflake" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lua-ls" "lychee" "markdownlint" "mkdocs-linkcheck" "mypy" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "rome" "statix" "typos" "vale" "yamllint" ];
56+
[ "ansible-lint" "autoflake" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lychee" "mkdocs-linkcheck" "mypy" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "rome" "statix" ];
4657

4758
# PLEASE keep this sorted alphabetically.
4859
options.settings = {
@@ -2367,7 +2378,7 @@ in
23672378
name = "markdownlint";
23682379
description = "Style checker and linter for markdown files.";
23692380
package = tools.markdownlint-cli;
2370-
entry = "${hooks.markdownlint.package}/bin/markdownlint -c ${pkgs.writeText "markdownlint.json" (builtins.toJSON hooks.markdownlint.settings.config)}";
2381+
entry = "${hooks.markdownlint.package}/bin/markdownlint -c ${pkgs.writeText "markdownlint.json" (builtins.toJSON hooks.markdownlint.settings.configuration)}";
23712382
files = "\\.md$";
23722383
};
23732384
mdl =

0 commit comments

Comments
 (0)