pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #110837 from rvolosatovs/update/neovim

neovim: 0.4.4 -> 0.5.0

authored by Bernardo Meurer and committed by GitHub a143a6dd 920b9f2d

+6 -6
unified split
+5 -2
pkgs/applications/editors/neovim/default.nix
··· 2 2 , libuv, lua, ncurses, pkg-config 3 3 , unibilium, xsel, gperf 4 4 , libvterm-neovim 5 + , tree-sitter 5 6 , glibcLocales ? null, procps ? null 6 7 7 8 # now defaults to false because some tests can be flaky (clipboard etc) ··· 31 32 in 32 33 stdenv.mkDerivation rec { 33 34 pname = "neovim-unwrapped"; 34 - version = "0.4.4"; 35 + version = "0.5.0"; 35 36 36 37 src = fetchFromGitHub { 37 38 owner = "neovim"; 38 39 repo = "neovim"; 39 40 rev = "v${version}"; 40 - sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; 41 + sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi"; 41 42 }; 42 43 43 44 patches = [ ··· 58 59 msgpack 59 60 ncurses 60 61 neovimLuaEnv 62 + tree-sitter 61 63 unibilium 62 64 ] ++ optional stdenv.isDarwin libiconv 63 65 ++ optionals doCheck [ glibcLocales procps ] ··· 96 98 "-DGPERF_PRG=${gperf}/bin/gperf" 97 99 "-DLUA_PRG=${neovimLuaEnv.interpreter}" 98 100 "-DLIBLUV_LIBRARY=${luvpath}" 101 + "-DUSE_BUNDLED=OFF" 99 102 ] 100 103 ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" 101 104 ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
+1 -4
pkgs/top-level/all-packages.nix
··· 27446 27446 wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; 27447 27447 wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); 27448 27448 neovim-unwrapped = callPackage ../applications/editors/neovim { 27449 - lua = 27450 - # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 27451 - if stdenv.isAarch64 then lua5_1 else 27452 - luajit; 27449 + lua = luajit; 27453 27450 }; 27454 27451 27455 27452 neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };