From: Vladimír Čunát Subject: [PATCH] vim - .nix files settings: correct indentation - corrected config options Signed-off-by: Vladimír Čunát --- pkgs/applications/editors/vim/configurable.nix | 4 ++-- pkgs/applications/editors/vim/ft-nix-support.patch | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7e03fd6..6475504 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -26,10 +26,10 @@ composableDerivation {} { // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction - // edf { name = "mzscheme"; } #Include MzScheme interpreter. + // edf { name = "mzscheme"; feat = "mzschemeinterp"; } #Include MzScheme interpreter. // edf { name = "perl"; feat = "perlinterp"; enable = { buildNativeInputs = [perl]; };} #Include Perl interpreter. // edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter. - // edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "tcl"; feat = "tclinterp"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} // edf { name = "cscope"; } #Include cscope interface. diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 4b5a742..a99b03c 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -28,7 +28,7 @@ index 0000000..a2f9918 +" Language: nix +" Maintainer: Marc Weber +" Modify and commit if you feel that way -+" Last Change: 2007 Dec ++" Last Change: 2011 Feb +" +" this syntax file can be still be enhanced very much.. +" Don't ask, do it :-) @@ -38,6 +38,9 @@ index 0000000..a2f9918 + finish +endif + ++" Conform to nix coding style ++set shiftwidth=2 tabstop=2 expandtab ++ +syn keyword nixKeyword let throw inherit import true false null with +syn keyword nixConditional if else then +syn keyword nixBrace ( ) { } = -- tg: (46ac231..) vlada/vim (depends on: origin/trunk)