Skip to content

Commit ebf6379

Browse files
committed
lib/modules: remove specialArgsWith
It is now integrated into `evalNixvim`.
1 parent 31bf6d0 commit ebf6379

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

lib/modules.nix

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
self,
44
}:
55
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-
196
# Evaluate nixvim modules, checking warnings and assertions
207
evalNixvim =
218
{
@@ -29,7 +16,11 @@ rec {
2916
let
3017
result = lib.evalModules {
3118
modules = [ ../modules/top-level ] ++ modules;
32-
specialArgs = specialArgsWith extraSpecialArgs;
19+
specialArgs = {
20+
inherit lib;
21+
# TODO: deprecate `helpers`
22+
helpers = self;
23+
} // extraSpecialArgs;
3324
};
3425

3526
failedAssertions = getAssertionMessages result.config.assertions;
@@ -49,4 +40,9 @@ rec {
4940
(lib.filter (x: !x.assertion))
5041
(lib.map (x: x.message))
5142
];
43+
44+
# TODO: Removed 2024-09-25
45+
# NOTE: integrated into `evalNixvim`
46+
specialArgs = "`modules.specialArgs` has been removed.";
47+
specialArgsWith = throw "`module.specialArgsWith` has been removed.";
5248
}

0 commit comments

Comments
 (0)