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

misc: fix python environment options

Browse source
This commit is contained in:
Gaetan Lepage 2024-01-06 19:17:32 +01:00 • committed by Gaétan Lepage
parent a1f8b437b3
commit d52f656a8b
3 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/output.nix
View file

@ -39,22 +39,14 @@ in {
description = "Extra packages to be made available to neovim"; description = "Extra packages to be made available to neovim";
}; };
python = { extraPythonPackages = mkOption {
package = mkOption { type = with types; functionTo (listOf package);
type = types.package; default = p: [];
default = pkgs.python3; defaultText = literalExpression "p: with p; [ ]";
description = ""; description = "Python packages to add to the `PYTHONPATH` of neovim.";
}; example = lib.literalExpression ''
p: [ p.numpy ]
extraPythonPackages = mkOption { '';
type = with types; functionTo (listOf package);
default = p: [];
defaultText = literalExpression "p: with p; [ ]";
description = "Python packages to add to the `PYTHONPATH` of neovim.";
example = lib.literalExpression ''
p: [ p.numpy ]
'';
};
}; };
extraConfigLua = mkOption { extraConfigLua = mkOption {

11
tests/test-sources/examples.nix
View file

@ -2,13 +2,10 @@
plain = {}; plain = {};
python-packages = { python-packages = {
python = { extraPythonPackages = p:
package = pkgs.python3; with p; [
extraPythonPackages = p: numpy
with p; [ ];
numpy
];
};
}; };
simple-plugin = { simple-plugin = {

14
wrappers/modules/output.nix
View file

@ -100,16 +100,14 @@ in {
config.extraPlugins; config.extraPlugins;
neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({ neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({
inherit (config) viAlias vimAlias; inherit
(config)
extraPythonPackages
viAlias
vimAlias
;
# inherit customRC; # inherit customRC;
plugins = normalizedPlugins; plugins = normalizedPlugins;
# Python 3 environment
python3Env = let
python = config.python.package;
inherit (config.python) extraPythonPackages;
in
python.withPackages extraPythonPackages;
} }
# Necessary to make sure the runtime path is set properly in NixOS 22.05, # Necessary to make sure the runtime path is set properly in NixOS 22.05,
# or more generally before the commit: # or more generally before the commit: