alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #110837 from rvolosatovs/update/neovim

Browse source 
neovim: 0.4.4 -> 0.5.0
This commit is contained in:
Bernardo Meurer 2021-07-02 11:54:10 -07:00 committed by GitHub
parent 920b9f2d1a 58ba227160
commit a143a6dd34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/editors/neovim/default.nix
View file

@ -2,6 +2,7 @@
, libuv, lua, ncurses, pkg-config , libuv, lua, ncurses, pkg-config
, unibilium, xsel, gperf , unibilium, xsel, gperf
, libvterm-neovim , libvterm-neovim
, tree-sitter
, glibcLocales ? null, procps ? null , glibcLocales ? null, procps ? null
# now defaults to false because some tests can be flaky (clipboard etc) # now defaults to false because some tests can be flaky (clipboard etc)
@ -31,13 +32,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neovim-unwrapped"; pname = "neovim-unwrapped";
version = "0.4.4"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "neovim"; repo = "neovim";
rev = "v${version}"; rev = "v${version}";
sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";
}; };
patches = [ patches = [
@ -58,6 +59,7 @@ in
msgpack msgpack
ncurses ncurses
neovimLuaEnv neovimLuaEnv
tree-sitter
unibilium unibilium
] ++ optional stdenv.isDarwin libiconv ] ++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ] ++ optionals doCheck [ glibcLocales procps ]
@ -96,6 +98,7 @@ in
"-DGPERF_PRG=${gperf}/bin/gperf" "-DGPERF_PRG=${gperf}/bin/gperf"
"-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DLIBLUV_LIBRARY=${luvpath}" "-DLIBLUV_LIBRARY=${luvpath}"
"-DUSE_BUNDLED=OFF"
] ]
++ 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"

5
pkgs/top-level/all-packages.nix
View file

@ -27446,10 +27446,7 @@ in
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim { neovim-unwrapped = callPackage ../applications/editors/neovim {
lua = lua = luajit;
# neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879
if stdenv.isAarch64 then lua5_1 else
luajit;
}; };
neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };