Unverified Commit 7c1a58a6 authored by Gabriel Ebner's avatar Gabriel Ebner Committed by GitHub
Browse files

Merge pull request #139613 from gebner/neovim051 

neovim: 0.5.0 -> 0.5.1
parents 75b5e5ee 7005f1e6

maintainers/scripts/luarocks-packages.csv

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ luautf8,,,,,,pstn 
luazip,,,,,,

lua-yajl,,,,,,pstn

luuid,,,,,,

luv,,,,1.30.0-0,,

luv,,,,1.42.0-0,,

lyaml,,,,,,lblasc

markdown,,,,,,

mediator_lua,,,,,,

pkgs/applications/editors/neovim/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ let 
in

  stdenv.mkDerivation rec {

    pname = "neovim-unwrapped";

    version = "0.5.0";

    version = "0.5.1";



    src = fetchFromGitHub {

      owner = "neovim";

      repo = "neovim";

      rev = "v${version}";

      sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";

      sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk";

    };



    patches = [

pkgs/development/lua-modules/generated-packages.nix

+93 −52

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/development/lua-modules/overrides.nix

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ with super; 
        preBuild = self.luv.preBuild + ''

          sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt

          sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt

          sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt

          sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt

        '';



        nativeBuildInputs = [ pkgs.fixDarwinDylibNames ];