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

treewide: avoid passing pkgs to our lib

Browse source 
In the two places where our "helpers" lib is exclusively internal
(flake module args and building the docs), we no longer supply `pkgs`.

In the other 4 locations, we now note why we still do in a comment.
This commit is contained in:
Matt Sturgeon 2024-09-20 11:24:43 +01:00
parent 76df09619d
commit 191b0a9502
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
7 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake-modules/legacy-packages.nix
View file

@ -1,8 +1,8 @@
{ helpers, ... }:
{
perSystem =
{
pkgs,
helpers,
makeNixvimWithModule,
...
}:

7
flake-modules/lib.nix
View file

@ -5,11 +5,7 @@
...
}:
{
perSystem =
{ pkgs, ... }:
{
_module.args.helpers = import ../lib { inherit lib pkgs; };
};
_module.args.helpers = import ../lib { inherit lib; };
# TODO: output lib without pkgs at the top-level
flake.lib = lib.genAttrs config.systems (
@ -18,6 +14,7 @@
{
# NOTE: this is the publicly documented flake output we've had for a while
check = import ../lib/tests.nix { inherit lib pkgs; };
# NOTE: user-facing so we must include the legacy `pkgs` argument
helpers = import ../lib { inherit lib pkgs; };
}
)

3
flake-modules/tests.nix
View file

@ -1,11 +1,10 @@
{ self, ... }:
{ self, helpers, ... }:
{
perSystem =
{
pkgs,
pkgsUnfree,
system,
helpers,
makeNixvimWithModule,
self',
...