Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/misc/vim-plugins/default.nix

pkgs/applications/editors/vim/configurable.nix

@@ -1,9 +1,35 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
-args@{source ? "default", ...}: with args;
+args@{pkgs, source ? "default", ...}: with args;
 
 
-let inherit (args.composableDerivation) composableDerivation edf; in
+let inherit (args.composableDerivation) composableDerivation edf;
+  nixosRuntimepath = pkgs.writeText "nixos-vimrc" ''
+    set nocompatible
+    syntax on
+
+    function! NixosPluginPath()
+      let seen = {}
+      for p in reverse(split($NIX_PROFILES))
+        for d in split(glob(p . '/share/vim-plugins/*'))
+          let pluginname = substitute(d, ".*/", "", "")
+          if !has_key(seen, pluginname)
+            exec 'set runtimepath^='.d
+            let seen[pluginname] = 1
+          endif
+        endfor
+      endfor
+    endfunction
+
+    execute NixosPluginPath()
+
+    if filereadable("/etc/vimrc")
+      source /etc/vimrc
+    elseif filereadable("/etc/vim/vimrc")
+      source /etc/vim/vimrc
+    endif
+  '';
+in
 composableDerivation {
   # use gccApple to compile on darwin
   mkDerivation = ( if stdenv.isDarwin
@@ -11,18 +37,18 @@ composableDerivation {
                    else stdenv ).mkDerivation;
 } (fix: {
 
-    name = "vim_configurable-7.4.316";
+    name = "vim_configurable-7.4.335";
 
     enableParallelBuilding = true; # test this
 
-    src = 
+    src =
       builtins.getAttr source {
       "default" =
         # latest release
       args.fetchhg {
             url = "https://vim.googlecode.com/hg/";
-            rev = "v7-4-316";
-            sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
+            rev = "v7-4-335";
+            sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj";
       };
 
       "vim-nox" =
@@ -39,7 +65,7 @@ composableDerivation {
 
     # if darwin support is enabled, we want to make sure we're not building with
     # OS-installed python framework
-    patches = stdenv.lib.optionals 
+    patches = stdenv.lib.optionals
       (stdenv.isDarwin && (config.vim.darwin or true))
       [ ./python_framework.patch ];
 
@@ -145,6 +171,8 @@ composableDerivation {
     echo $nativeBuildInputs
     echo $rpath
     patchelf --set-rpath $rpath $out/bin/{vim,gvim}
+
+    ln -sfn ${nixosRuntimepath} $out/share/vim/vimrc
   '';
 
   dontStrip = 1;

pkgs/applications/editors/vim/default.nix

@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "vim-${version}";
 
-  version = "7.4.316";
+  version = "7.4.335";
 
   src = fetchhg {
     url = "https://vim.googlecode.com/hg/";
-    rev = "v7-4-316";
-    sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
+    rev = "v7-4-335";
+    sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj";
   };
 
   enableParallelBuilding = true;

pkgs/applications/editors/vim/wrapper.nix

@@ -1,32 +0,0 @@
-{ stdenv, makeWrapper, writeText, vim, vimrc }:
-
-let
-
-  vimrcfile = writeText "vimrc" vimrc;
-
-  p = builtins.parseDrvName vim.name;
-
-in stdenv.mkDerivation rec {
-  name = "${p.name}-with-vimrc-${p.version}";
-
-  buildInputs = [ makeWrapper vim vimrcfile ];
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r ${vim}/* $out/
-
-    chmod u+w $out/bin
-    chmod u+w $out/share/vim
-
-    ln -s ${vimrcfile} $out/share/vim/vimrc
-    wrapProgram $out/bin/vim --set VIM "$out/share/vim"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "The most popular clone of the VI editor";
-    homepage    = http://www.vim.org;
-    platforms   = platforms.unix;
-  };
-}