neovim: sort lists alphabetically

This commit is contained in:
Craig Hall 2019-08-01 12:52:11 +01:00 committed by Roman Volosatovs
parent 48af02a402
commit 6bdaca51e8
No known key found for this signature in database
GPG Key ID: 2660C5FDCEBE6F87

View File

@ -13,7 +13,7 @@ with stdenv.lib;
let let
neovimLuaEnv = lua.withPackages(ps: neovimLuaEnv = lua.withPackages(ps:
(with ps; [ mpack lpeg luabitop ] (with ps; [ lpeg luabitop mpack ]
++ optionals doCheck [ ++ optionals doCheck [
nvim-client luv coxpcall busted luafilesystem penlight inspect nvim-client luv coxpcall busted luafilesystem penlight inspect
] ]
@ -41,14 +41,14 @@ in
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
gperf
libtermkey libtermkey
libuv libuv
libvterm-neovim
msgpack msgpack
ncurses ncurses
libvterm-neovim
unibilium
gperf
neovimLuaEnv neovimLuaEnv
unibilium
] ++ optional withJemalloc jemalloc ] ++ optional withJemalloc jemalloc
++ optional stdenv.isDarwin libiconv ++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ] ++ optionals doCheck [ glibcLocales procps ]
@ -77,8 +77,8 @@ in
disallowedReferences = [ stdenv.cc ]; disallowedReferences = [ stdenv.cc ];
cmakeFlags = [ cmakeFlags = [
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DGPERF_PRG=${gperf}/bin/gperf" "-DGPERF_PRG=${gperf}/bin/gperf"
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
] ]
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"