flake: remove getHelpers function

This commit is contained in:
Matt Sturgeon 2024-07-08 07:32:53 +01:00
parent 1b7efacdf4
commit 8b9ba44195
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
3 changed files with 9 additions and 14 deletions

View file

@ -1,4 +1,6 @@
{ getHelpers, pkgs }:
{
pkgs ? import <nixpkgs> { config.enableUnfree = true; },
}:
let
# Extend nixpkg's lib, so that we can handle recursive leaf types such as `either`
lib = pkgs.lib.extend (
@ -32,7 +34,10 @@ let
inherit lib;
};
helpers = getHelpers pkgsDoc false;
helpers = import ../lib/helpers.nix {
inherit lib;
pkgs = pkgsDoc;
};
nixvimPath = toString ./..;

View file

@ -1,15 +1,7 @@
{ getHelpers, ... }:
{
_module.args.getHelpers =
pkgs: _nixvimTests:
import ../lib/helpers.nix {
inherit pkgs _nixvimTests;
inherit (pkgs) lib;
};
perSystem =
{ pkgs, config, ... }:
{ pkgs, ... }:
{
_module.args.helpers = getHelpers pkgs false;
_module.args.helpers = import ../lib/helpers.nix { inherit pkgs; };
};
}

View file

@ -1,10 +1,8 @@
{ getHelpers, ... }:
{
perSystem =
{ pkgsUnfree, config, ... }:
{
packages = import ../docs {
inherit getHelpers;
# Building the docs evaluates each plugin's default package, some of which are unfree
pkgs = pkgsUnfree;
};