lib: segregate and deprecate functions that need pkgs

Splits everything that depends on a `pkgs` instance into an optional
attrs, allowing `helpers.nix` to be bootstrapped without `pkgs`.

This required some refactoring:
- `modules.specialArgs` is only available when `pkgs` is used
- `modules.specialArgsWith` now requires `defaultPkgs` be provided
- `builders.*` now have `*With` variants that take `pkgs` as an argument
  and a `withPkgs` function that returns the old interface
- Had to define the fixed part of `builders` outside the attrs for now,
  to avoid infinite recursion.
- The old `builders` are now deprecated, and print a warning when
  evaluated
- `withOptoinalFns` was introduced to merge the optional attrs into the
  final lib.
This commit is contained in:
Matt Sturgeon 2024-09-12 14:56:36 +01:00
parent f47e8f8f79
commit 4e5bd1d79b
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
12 changed files with 165 additions and 84 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, helpers, ... }:
{ pkgs, ... }:
let
isByteCompiledFun = ''
local function is_byte_compiled(filename)
@ -25,7 +25,15 @@ let
in
{
default =
{ config, ... }:
{
config,
lib,
pkgs,
...
}:
let
writeLua = lib.nixvim.builders.writeLuaWith pkgs;
in
{
performance.byteCompileLua.enable = true;
@ -33,7 +41,7 @@ in
# By text
"plugin/file_text.lua".text = "vim.opt.tabstop = 2";
# By simple source derivation using buildCommand
"plugin/file_source.lua".source = helpers.writeLua "file_source.lua" "vim.opt.tabstop = 2";
"plugin/file_source.lua".source = writeLua "file_source.lua" "vim.opt.tabstop = 2";
# By standard derivation, it needs to execute fixupPhase
"plugin/file_drv.lua".source = pkgs.stdenvNoCC.mkDerivation {
name = "file_drv.lua";
@ -48,13 +56,13 @@ in
"plugin/file_string.lua".source = builtins.toFile "file_path.lua" "vim.opt.tabstop = 2";
# By derivation converted to string
"plugin/file_drv_string.lua".source = toString (
helpers.writeLua "file_drv_string.lua" "vim.opt.tabstop = 2"
writeLua "file_drv_string.lua" "vim.opt.tabstop = 2"
);
# Non-lua files
"plugin/test.vim".text = "set tabstop=2";
"plugin/test.json".text = builtins.toJSON { a = 1; };
# Lua file with txt extension won't be byte compiled
"test.txt".source = helpers.writeLua "test.txt" "vim.opt.tabstop = 2";
"test.txt".source = writeLua "test.txt" "vim.opt.tabstop = 2";
};
files = {