Merge branch 'master' into staging

Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
parent 5ad9db0473 961ed7c8b4
commit b4af993c3f
151 changed files with 6654 additions and 1254 deletions
@@ -139,7 +139,7 @@ composableDerivation {
    nlsSupport       = config.vim.nls or false;
    tclSupport       = config.vim.tcl or false;
    multibyteSupport = config.vim.multibyte or false;
-    cscopeSupport    = config.vim.cscope or false;
+    cscopeSupport    = config.vim.cscope or true;
    netbeansSupport  = config.netbeans or true; # eg envim is using it

    # by default, compile with darwin support if we're compiling on darwin, but