Merge staging-next into staging

1 files changed, 10 insertions, 0 deletions

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 475330a5fe57..0d54817c5340 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -6,6 +6,7 @@
 
 # now defaults to false because some tests can be flaky (clipboard etc)
 , doCheck ? false
+, nodejs ? null, fish ? null, python ? null
 }:
 
 with stdenv.lib;
@@ -17,6 +18,8 @@ let
         nvim-client luv coxpcall busted luafilesystem penlight inspect
       ]
     ));
+
+  pyEnv = python.withPackages(ps: [ ps.pynvim ps.msgpack ]);
 in
   stdenv.mkDerivation rec {
     pname = "neovim-unwrapped";
@@ -67,6 +70,13 @@ in
       pkgconfig
     ];
 
+    # extra programs test via `make functionaltest`
+    checkInputs = [
+      fish
+      nodejs
+      pyEnv      # for src/clint.py
+    ];
+
 
     # nvim --version output retains compilation flags and references to build tools
     postPatch = ''