diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-27 09:04:53 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-27 09:04:53 +0200 |
commit | a64058e20533fe18e69d30e8e46cbecb1940d024 (patch) | |
tree | 0e377da2038a3c06b946a5bab3cde302ebfcbf26 /doc/languages-frameworks | |
parent | d3d6159046a9dbbd23afd1fb76cb2df33458f19a (diff) | |
parent | 549b61cc59d4808a16ab9ef8dcf8a96cfc493dbd (diff) |
Merge master into staging-next
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r-- | doc/languages-frameworks/coq.xml | 4 | ||||
-rw-r--r-- | doc/languages-frameworks/vim.section.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index 640b04c7da9dd..4314df5c9df29 100644 --- a/doc/languages-frameworks/coq.xml +++ b/doc/languages-frameworks/coq.xml @@ -12,8 +12,8 @@ <para> Some extensions (plugins) might require OCaml and sometimes other OCaml - packages. The <literal>coq.ocamlPackages</literal> attribute can be used - to depend on the same package set Coq was built against. + packages. The <literal>coq.ocamlPackages</literal> attribute can be used to + depend on the same package set Coq was built against. </para> <para> diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 1b235dbb52f63..2cec1543a249b 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -23,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code: ``` vim_configurable.customize { + # `name` specifies the name of the executable and package name = "vim-with-plugins"; vimrcConfig.customRC = '' @@ -31,6 +32,8 @@ vim_configurable.customize { } ``` +This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`. + For Neovim the `configure` argument can be overridden to achieve the same: ``` @@ -83,6 +86,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n { packageOverrides = pkgs: with pkgs; { myVim = vim_configurable.customize { + # `name` specifies the name of the executable and package name = "vim-with-plugins"; # add here code from the example section }; |