mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-08-02 17:15:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

lib: cleanup with lib

Browse source
This commit is contained in:
Austin Horstman 2024-08-30 14:49:20 -05:00
parent c76e5070b9
commit 35788bbc5a
No known key found for this signature in database
9 changed files with 179 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

45
lib/deprecation.nix
View file

@ -1,5 +1,4 @@
{ lib }:
with lib;
rec {
# Get a (sub)option by walking the path,
# checking for submodules along the way
@ -7,14 +6,14 @@ rec {
opt: prefix: optionPath:
if optionPath == [ ] then
opt
else if isOption opt then
else if lib.isOption opt then
getOptionRecursive (opt.type.getSubOptions prefix) prefix optionPath
else
let
name = head optionPath;
opt' = getAttr name opt;
name = lib.head optionPath;
opt' = lib.getAttr name opt;
prefix' = prefix ++ [ name ];
optionPath' = drop 1 optionPath;
optionPath' = lib.drop 1 optionPath;
in
getOptionRecursive opt' prefix' optionPath';
@ -24,24 +23,26 @@ rec {
optionPath: replacementInstructions:
{ options, ... }:
{
options = setAttrByPath optionPath (mkOption {
# When (e.g.) `mkAttrs` is used on a submodule, this option will be evaluated.
# Therefore we have to apply _something_ (null) when there's no definition.
apply =
v:
let
# Avoid "option used but not defined" errors
res = builtins.tryEval v;
in
if res.success then res.value else null;
visible = false;
});
options = lib.setAttrByPath optionPath (
lib.mkOption {
# When (e.g.) `mkAttrs` is used on a submodule, this option will be evaluated.
# Therefore we have to apply _something_ (null) when there's no definition.
apply =
v:
let
# Avoid "option used but not defined" errors
res = builtins.tryEval v;
in
if res.success then res.value else null;
visible = false;
}
);
config.warnings =
let
opt = getOptionRecursive options [ ] optionPath;
in
optional opt.isDefined ''
The option definition `${showOption optionPath}' in ${showFiles opt.files} is deprecated.
lib.optional opt.isDefined ''
The option definition `${lib.showOption optionPath}' in ${lib.showFiles opt.files} is deprecated.
${replacementInstructions}
'';
};
@ -51,11 +52,11 @@ rec {
map (
option':
let
option = toList option';
option = lib.toList option';
oldPath = oldPrefix ++ option;
newPath = newPrefix ++ map nixvim.toSnakeCase option;
newPath = newPrefix ++ map lib.nixvim.toSnakeCase option;
in
mkRenamedOptionModule oldPath newPath
lib.mkRenamedOptionModule oldPath newPath
);
# A clone of types.coercedTo, but it prints a warning when oldType is used.