Unverified Commit 0e4493ea authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

Revert "neovim: set provider configuration to initrc" (#492172)

parents ff246e49 0f4517f2

doc/release-notes/rl-2605.section.md

+0 −2
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ 
- `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.

  Some existing OpenRGB plugins may be incompatible or require updates.



- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false.



- We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.



## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}

pkgs/applications/editors/neovim/wrapper.nix

+25 −23
Original line number Diff line number Diff line
@@ -104,16 +104,13 @@ let 
        packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage;

        finalPackdir = neovimUtils.packDir packpathDirs;



        rcContent = lib.concatStringsSep "\n" (

          [

            providerLuaRc

          ]

          ++ lib.optional (luaRcContent != "") luaRcContent

          ++ lib.optional (neovimRcContent' != "") ''

        rcContent = ''

          ${luaRcContent}

        ''

        + lib.optionalString (neovimRcContent' != "") ''

          vim.cmd.source "${writeText "init.vim" neovimRcContent'}"

        ''

          ++ lib.optionals autoconfigure vimPackageInfo.pluginAdvisedLua

        );

        + lib.optionalString autoconfigure (lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua);



        python3Env =

          lib.warnIf (attrs ? python3Env)
@@ -128,7 +125,12 @@ let 


        wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;



        generatedWrapperArgs =

        generatedWrapperArgs = [

          # vim accepts a limited number of commands so we join all the provider ones

          "--add-flags"

          ''--cmd "lua ${providerLuaRc}"''

        ]

        ++

          lib.optionals

            (

              finalAttrs.packpathDirs.myNeovimPackages.start != [ ]
@@ -179,7 +181,7 @@ let 
        ++ lib.optionals finalAttrs.wrapRc [

          "--set-default"

          "VIMINIT"

          "lua dofile('${writeText "init.lua" finalAttrs.luaRcContent}')"

          "lua dofile('${writeText "init.lua" rcContent}')"

        ]

        ++ finalAttrs.generatedWrapperArgs;