mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-08-04 10:06:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

modules/{output,files,test}: move outputs to build scope

Browse source 
Move the following output options into `build`:
- finalPackage -> package
- printInitPackage
- initPath -> initFile
- filesPlugin -> extraFiles
- test.derivation -> test
This commit is contained in:
Matt Sturgeon 2024-09-24 07:02:22 +01:00
parent 7bda0f1ce4
commit 692e39311e
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
14 changed files with 129 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/test-sources/modules/performance/byte-compile-lua.nix
View file

@ -90,7 +90,7 @@ in
assert(is_byte_compiled(init), "MYVIMRC is expected to be byte compiled, but it's not")
-- nixvim-print-init prints text
local init_content = vim.fn.system("${config.printInitPackage}/bin/nixvim-print-init")
local init_content = vim.fn.system("${lib.getExe config.build.printInitPackage}")
assert(init_content:find("VALIDATING_STRING"), "nixvim-print-init's output is byte compiled")
-- lua extraFiles are byte compiled
@ -116,7 +116,11 @@ in
};
disabled =
{ config, ... }:
{
config,
lib,
...
}:
{
performance.byteCompileLua.enable = false;
@ -140,7 +144,7 @@ in
assert(not is_byte_compiled(init), "MYVIMRC is not expected to be byte compiled, but it is")
-- nixvim-print-init prints text
local init_content = vim.fn.system("${config.printInitPackage}/bin/nixvim-print-init")
local init_content = vim.fn.system("${lib.getExe config.build.printInitPackage}")
assert(init_content:find("VALIDATING_STRING"), "nixvim-print-init's output is byte compiled")
-- Nothing is byte compiled

44
tests/test-sources/modules/performance/combine-plugins.nix
View file

@ -2,10 +2,10 @@
let
inherit (pkgs) lib;
# Count plugins of given type excluding 'filesPlugin'
# Count plugins of given type excluding 'build.extraFiles'
pluginCount =
pkg: filesPlugin: type:
builtins.length (builtins.filter (p: p != filesPlugin) pkg.packpathDirs.myNeovimPackages.${type});
pkg: files: type:
builtins.length (builtins.filter (p: p != files) pkg.packpathDirs.myNeovimPackages.${type});
in
{
# Test basic functionality
@ -33,7 +33,7 @@ in
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one plugin is defined in packpathDirs, expected one plugin pack.";
}
];
@ -50,7 +50,7 @@ in
];
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" >= 2;
assertion = pluginCount config.build.package config.build.extraFiles "start" >= 2;
message = "Only one plugin is defined in packpathDirs, expected at least two.";
}
];
@ -77,7 +77,7 @@ in
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one plugin is defined in packpathDirs.";
}
];
@ -105,7 +105,7 @@ in
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one plugin is defined in packpathDirs.";
}
];
@ -132,7 +132,7 @@ in
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one plugin is defined in packpathDirs.";
}
];
@ -186,11 +186,11 @@ in
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one start plugin is defined in packpathDirs";
}
{
assertion = pluginCount config.finalPackage config.filesPlugin "opt" == 2;
assertion = pluginCount config.build.package config.build.extraFiles "opt" == 2;
message = "Less than two opt plugins are defined in packpathDirs";
}
];
@ -233,13 +233,13 @@ in
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one start plugin is defined in packpathDirs";
}
];
};
# Test that config.filesPlugin is not combined
# Test that config.build.extraFiles is not combined
files-plugin =
{ config, ... }:
{
@ -248,7 +248,7 @@ in
nvim-treesitter
vim-nix
];
# Ensure that filesPlugin is added extraPlugins
# Ensure that build.extraFiles is added extraPlugins
wrapRc = true;
# Extra user files colliding with plugins
extraFiles = {
@ -287,23 +287,23 @@ in
assert(#get_paths("ftdetect/nix.vim") == 2, "only one version of ftdetect/nix.vim")
assert(#get_paths("queries/nix/highlights.scm") == 2, "only one version of queries/nix/highlights.scm")
-- First found file is from filesPlugin
-- First found file is from build.extraFiles
assert(
get_paths("ftplugin/nix.vim")[1]:find("${lib.getName config.filesPlugin}", 1, true),
"first found ftplugin/nix.vim isn't in filesPlugin runtime path"
get_paths("ftplugin/nix.vim")[1]:find("${lib.getName config.build.extraFiles}", 1, true),
"first found ftplugin/nix.vim isn't in build.extraFiles runtime path"
)
assert(
get_paths("queries/nix/highlights.scm")[1]:find("${lib.getName config.filesPlugin}", 1, true),
"first found queries/nix/highlights.scm isn't in filesPlugin runtime path"
get_paths("queries/nix/highlights.scm")[1]:find("${lib.getName config.build.extraFiles}", 1, true),
"first found queries/nix/highlights.scm isn't in build.extraFiles runtime path"
)
assert(
get_paths("queries/nix/highlights.scm")[1]:find("${lib.getName config.filesPlugin}", 1, true),
"first found queries/nix/highlights.scm isn't in filesPlugin runtime path"
get_paths("queries/nix/highlights.scm")[1]:find("${lib.getName config.build.extraFiles}", 1, true),
"first found queries/nix/highlights.scm isn't in build.extraFiles runtime path"
)
'';
assertions = [
{
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 1;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 1;
message = "More than one start plugin is defined in packpathDirs";
}
];
@ -369,7 +369,7 @@ in
assertions = [
{
# plugin-pack, nvim-treesitter, nvim-lspconfig, telescope-nvim, nvim-cmp
assertion = pluginCount config.finalPackage config.filesPlugin "start" == 5;
assertion = pluginCount config.build.package config.build.extraFiles "start" == 5;
message = "Wrong number of plugins in packpathDirs";
}
];