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

flake: remove getHelpers function

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

9
docs/default.nix
View file

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

12
flake-modules/helpers.nix
View file

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

2
flake-modules/packages.nix
View file

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