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