mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-07-22 03:35:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

lib: remove dependency on pkgs

Browse source
This commit is contained in:
Matt Sturgeon 2024-12-15 05:23:06 +00:00
parent 9e6b207401
commit 32027965d8
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
6 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/default.nix
View file

@ -1,37 +1,19 @@
{
pkgs ? null,
lib ? pkgs.lib,
lib,
_nixvimTests ? false,
...
}:
lib.fix (
self:
let
# Used when importing parts of our lib
call = lib.callPackageWith {
inherit call pkgs self;
inherit call self;
lib = self.extendedLib;
};
# Define this outside of the attrs to avoid infinite recursion,
# since the final value will have been merged from two places
builders = call ./builders.nix { };
# We used to provide top-level access to the "builder" functions, with `pkgs` already baked in
# TODO: deprecated 2024-09-13; after 24.11 this can be simplified to always throw
deprecatedBuilders = lib.mapAttrs (
name: value:
let
notice = "`${name}` is deprecated";
opt = lib.optionalString (pkgs == null) " and not available in this instance of nixvim's lib";
advice = "You should either use `${name}With` or access `${name}` via `builders.withPkgs`";
msg = "${notice}${opt}. ${advice}.";
in
if pkgs == null then throw msg else lib.warn msg value
) (builders.withPkgs pkgs);
in
{
autocmd = call ./autocmd-helpers.nix { };
builders = call ./builders.nix { };
deprecation = call ./deprecation.nix { };
extendedLib = call ./extend-lib.nix { inherit lib; };
keymaps = call ./keymap-helpers.nix { };
@ -42,8 +24,9 @@ lib.fix (
utils = call ./utils.nix { inherit _nixvimTests; };
vim-plugin = call ./vim-plugin.nix { };
# Handle builders, which has some deprecated stuff that depends on `pkgs`
builders = builders // deprecatedBuilders;
# Top-level helper aliases:
# TODO: deprecate some aliases
inherit (self.builders)
writeLua
writeByteCompiledLua
@ -52,9 +35,6 @@ lib.fix (
byteCompileLuaDrv
;
# Top-level helper aliases:
# TODO: deprecate some aliases
inherit (self.deprecation)
getOptionRecursive
mkDeprecatedSubOptionModule