Skip to content

Commit b856d8e

Browse files
committed
lib/modules: remove specialArgsWith
1 parent b877bfc commit b856d8e

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

lib/modules.nix

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
lib,
33
self,
44
}:
5-
rec {
6-
# Minimal specialArgs required to evaluate nixvim modules
7-
specialArgs = specialArgsWith { };
8-
9-
# Build specialArgs for evaluating nixvim modules
10-
specialArgsWith =
11-
extraSpecialArgs:
12-
{
13-
inherit lib;
14-
# TODO: deprecate `helpers`
15-
helpers = self;
16-
}
17-
// extraSpecialArgs;
18-
5+
let
6+
removed = {
7+
# Removed 2024-09-24
8+
getAssertionMessages = "";
9+
# Removed 2024-09-27
10+
specialArgs = "It has been integrated into `evalNixvim`";
11+
specialArgsWith = "It has been integrated into `evalNixvim`";
12+
};
13+
in
14+
{
1915
# Evaluate nixvim modules, checking warnings and assertions
2016
evalNixvim =
2117
{
@@ -29,9 +25,14 @@ rec {
2925
"`evalNixvim`: passing `check` is no longer supported. Checks are now done when evaluating `config.build.package` and can be avoided by using `config.build.packageUnchecked` instead.";
3026
lib.evalModules {
3127
modules = [ ../modules/top-level ] ++ modules;
32-
specialArgs = specialArgsWith extraSpecialArgs;
28+
specialArgs = {
29+
inherit lib;
30+
# TODO: deprecate `helpers`
31+
helpers = self;
32+
} // extraSpecialArgs;
3333
};
34-
35-
# TODO: Removed 2024-09-24
36-
getAssertionMessages = throw "`modules.getAssertionMessages` has been removed.";
3734
}
35+
// lib.mapAttrs (
36+
name: msg:
37+
throw ("`modules.${name}` has been removed." + lib.optionalString (msg != "") (" " + msg))
38+
) removed

0 commit comments

Comments
 (0)