commit 1ada32da4ba24d7310653c9ac54888bee463f455 · pyrox.dev/nixpkgs

pkgs/applications/editors/neovim/tests/default.nix

···

       74
       74
        
           }) (''

     

       75
       75
        
             source ${nmt}/bash-lib/assertions.sh

     

       76
       76
        
             vimrc="${writeText "init.vim" neovim-drv.initRc}"

     

       77
       77
       +
             luarc="${writeText "init.lua" neovim-drv.luaRcContent}"

     

       78
       78
       +
             luarcGeneric="$out/patched.lua"

     

       77
       79
        
             vimrcGeneric="$out/patched.vim"

     

       78
       80
        
             mkdir $out

     

       79
       81
        
             ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric"

     

       82
       82
       +
             ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$luarc" > "$luarcGeneric"

     

       80
       83
        
           '' + buildCommand);

     

       81
       84
        
       

     

       82
       85
        
       in

     
···

       89
       92
        
         nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix;

     

       90
       93
        
       

     

       91
       94
        
         singlelinesconfig = runTest (wrapNeovim2 "-single-lines" nvimConfSingleLines) ''

     

       95
       95
       +
             assertFileContains \

     

       96
       96
       +
               "$luarcGeneric" \

     

       97
       97
       +
               "vim.cmd.source \"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-init.vim"

     

       92
       98
        
             assertFileContent \

     

       93
       99
        
               "$vimrcGeneric" \

     

       94
       100
        
               "${./init-single-lines.vim}"

+13 -2

pkgs/applications/editors/neovim/wrapper.nix

···

       32
       32
        
           # set to false if you want to control where to save the generated config

     

       33
       33
        
           # (e.g., in ~/.config/init.vim or project/.nvimrc)

     

       34
       34
        
           , wrapRc ? true

     

       35
       35
       -
           , neovimRcContent ? ""

     

       35
       35
       +
           # vimL code that should be sourced as part of the generated init.lua file

     

       36
       36
       +
           , neovimRcContent ? null

     

       37
       37
       +
           # lua code to put into the generated init.lua file

     

       38
       38
       +
           , luaRcContent ? ""

     

       36
       39
        
           # entry to load in packpath

     

       37
       40
        
           , packpathDirs

     

       38
       41
        
           , ...

     

       39
       42
        
         }:

     

       43
       43
       +
       

     

       40
       44
        
         let

     

       41
       45
        
       

     

       46
       46
       +
           rcContent = ''

     

       47
       47
       +
             ${luaRcContent}

     

       48
       48
       +
           '' + lib.optionalString (!isNull neovimRcContent) ''

     

       49
       49
       +
             vim.cmd.source "${writeText "init.vim" neovimRcContent}"

     

       50
       50
       +
           '';

     

       51
       51
       +
       

     

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

     

       43
       53
        
       

     

       44
       54
        
           commonWrapperArgs =

     
···

       66
       76
        
           finalMakeWrapperArgs =

     

       67
       77
        
             [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim" ]

     

       68
       78
        
             ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]

     

       69
       69
       -
             ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ]

     

       79
       79
       +
             ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.lua" rcContent}" ]

     

       70
       80
        
             ++ commonWrapperArgs

     

       71
       81
        
             ;

     

       72
       82
        
       

     
···

       84
       94
        
             inherit python3Env rubyEnv;

     

       85
       95
        
             withRuby = rubyEnv != null;

     

       86
       96
        
             inherit wrapperArgs;

     

       97
       97
       +
             luaRcContent = rcContent;

     

       87
       98
        
       

     

       88
       99
        
             # Remove the symlinks created by symlinkJoin which we need to perform

     

       89
       100
        
             # extra actions upon