Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 43b99f23b357
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 42cc40ddc810
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 2, 2020

  1. neovim: fix nodejs and ruby generation 

    These were not translated correctly in the new wrapper.
    @teto
    Matthieu Coudron authored and teto committed Nov 2, 2020
    Copy the full SHA
    42cc40d View commit details
Showing with 7 additions and 6 deletions.
  1. +4 −3 pkgs/applications/editors/neovim/utils.nix
  2. +3 −3 pkgs/applications/editors/neovim/wrapper.nix
7 changes: 4 additions & 3 deletions pkgs/applications/editors/neovim/utils.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ let
withPython2 ? false
/* the function you would have passed to python.withPackages */
, extraPython2Packages ? (_: [ ])
, withPython3 ? true
, withPython3 ? true
/* the function you would have passed to python3.withPackages */
, extraPython3Packages ? (_: [ ])
, withNodeJs ? false
@@ -45,7 +45,6 @@ let
'';
};


requiredPlugins = vimUtils.requiredPlugins configure;
getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));

@@ -104,9 +103,11 @@ let
wrapperArgs = makeWrapperArgs;
inherit neovimRcContent;
inherit manifestRc;
inherit rubyEnv;
inherit python2Env;
inherit python3Env;
inherit withNodeJs;
} // lib.optionalAttrs withRuby {
inherit rubyEnv;
};

genProviderSettings = prog: withProg:
6 changes: 3 additions & 3 deletions pkgs/applications/editors/neovim/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ let
, manifestRc ? null
, withPython2 ? true, python2Env ? null
, withPython3 ? true, python3Env ? null
, withNodeJs? false
, withRuby ? true, rubyEnv ? null
, withNodeJs ? false
, rubyEnv ? null
, vimAlias ? false
, viAlias ? false
, ...
@@ -52,7 +52,7 @@ let
+ optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
''
+ optionalString withRuby ''
+ optionalString (rubyEnv != null) ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
''
+ optionalString withNodeJs ''