From 454590f8845bb8c07d34e97e46bbd0dc8d2a05c8 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 21 Oct 2014 16:24:30 +0400
Subject: [PATCH] vim-plugins: add and update

---
 pkgs/misc/vim-plugins/default.nix | 724 ++++++++++++++++++++++++------
 1 file changed, 579 insertions(+), 145 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index cdbbaf13d843..59ff877f0a3f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, clang }:
+{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, clang, zip }:
 
 /*
 About Vim and plugins
@@ -18,7 +18,6 @@ Traditionally plugins were installed into ~/.vim/* so it was your task to keep t
 of which files belong to what plugin. Now this problem is "fixed" by nix which
 assembles your profile for you.
 
-
 Vim offers the :h rtp setting which works for most plugins. Thus adding adding
 this to your .vimrc should make most plugins work:
 
@@ -100,38 +99,58 @@ let vimHelpTags = ''
 in rec
 
 {
+  a = buildVimPlugin {
+    name = "a-git-2010-11-06";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/a.vim.git";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240";
+     };
+    meta = {
+      homepage = https://github.com/vim-scripts/a.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  alternative = a; # backwards compat, added 2014-10-21
+
   airline = buildVimPlugin {
-    name = "airline-git-2014-08-02";
+    name = "airline-git-2014-10-18";
     src = fetchgit {
       url = "https://github.com/bling/vim-airline.git";
-      rev = "2114e7025188a941e5c63b1f942d576adb98d8a4";
-      sha256 = "b6fc4d0545f8b7e107c5f80b94cf536a2b1fdd55d9f2484a29a007911e96130f";
+      rev = "616daceb735771ed27535abe8a6e4907320f1e82";
+      sha256 = "05ee7f6d58b14c35edda36183745e508bab19d2289b02af73f980062e51316e7";
      };
+    meta = {
+      homepage = https://github.com/bling/vim-airline; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   align = buildVimPlugin {
-    name = "align-git-2012-08-08";
+    name = "align-git-2012-08-07";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/Align.git";
+      url = "https://github.com/vim-scripts/align.git";
       rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
       sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
      };
+    meta = {
+      homepage = https://github.com/vim-scripts/align; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
-  alternate = stdenv.mkDerivation rec {
-    version = "2.18";
-    name    = "alternate-${version}";
-
-    src = fetchurl {
-      url    = "http://www.vim.org/scripts/download_script.php?src_id=7218";
-      name   = "a.vim";
-      sha256 = "1q22vfkv60sshp9yj3mmfc8azavgzz7rpmaf72iznzq4wccy6gac";
+  calendar = buildVimPlugin {
+    name = "calendar-git-2014-10-19";
+    src = fetchgit {
+      url = "https://github.com/itchyny/calendar.vim.git";
+      rev = "44890a96d80bcd5fe62307e4bcb4d4085010e324";
+      sha256 = "55f38e3e0af0f95229c654420c332668f93ac941f044c0573c7f1b26030e9202";
+     };
+    meta = {
+      homepage = https://github.com/itchyny/calendar.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
-    unpackPhase = ":";
-    installPhase = ''
-      mkdir -p $out/share/vim-plugins/vim-a
-      cp ${src} $out/share/vim-plugins/vim-a/a.vim
-    '';
   };
 
   coffee-script = buildVimPlugin {
@@ -141,8 +160,22 @@ in rec
       sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0";
     };
   };
+
   coffeeScript = coffee-script; # backwards compat, added 2014-10-18
 
+  colors-solarized = buildVimPlugin {
+    name = "colors-solarized-git-2011-05-09";
+    src = fetchgit {
+      url = "https://github.com/altercation/vim-colors-solarized.git";
+      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
+      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
+     };
+    meta = {
+      homepage = https://github.com/altercation/vim-colors-solarized; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
   colorsamplerpack = buildVimPlugin rec {
     version = "2012.10.28";
     name    = "colorsamplerpack-${version}";
@@ -173,15 +206,20 @@ in rec
       popd
     '';
   };
+
   command_T = command-t; # backwards compat, added 2014-10-18
 
   commentary = buildVimPlugin {
-    name = "commentary-git-2014-06-14";
+    name = "commentary-git-2014-06-27";
     src = fetchgit {
       url = "https://github.com/tpope/vim-commentary.git";
       rev = "8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1";
       sha256 = "5496ed31706552957d4caa76669ecd04e9b2853cf7a7e40bd0164726b21fcca0";
      };
+    meta = {
+      homepage = https://github.com/tpope/vim-commentary; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   ctrlp = buildVimPlugin rec {
@@ -198,6 +236,32 @@ in rec
     buildInputs = [ unzip ];
   };
 
+  easy-align = buildVimPlugin {
+    name = "easy-align-git-2014-10-03";
+    src = fetchgit {
+      url = "https://github.com/junegunn/vim-easy-align.git";
+      rev = "2595ebf9333f3598502276b29f78ad39965bc595";
+      sha256 = "1223b587c515169d4b735bf56f109f7bfc4f7c1327e76865f498309f7472ef78";
+     };
+    meta = {
+      homepage = https://github.com/junegunn/vim-easy-align; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  easymotion = buildVimPlugin {
+    name = "easymotion-git-2014-09-29";
+    src = fetchgit {
+      url = "https://github.com/lokaltog/vim-easymotion.git";
+      rev = "868cd71710a48e8ec8acffeabd1eebfb10812c77";
+      sha256 = "13c8b93c257fcbb0f6e0eb197700b4f8cbe4cf4846d29f1aba65f625202b9d77";
+     };
+    meta = {
+      homepage = https://github.com/lokaltog/vim-easymotion; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
   eighties = buildVimPlugin rec {
     version = "1.0.4";
     name = "eighties-${version}";
@@ -215,75 +279,136 @@ in rec
   };
 
   extradite = buildVimPlugin {
-    name = "extradite-git-2014-07-18";
+    name = "extradite-git-2014-06-18";
     src = fetchgit {
       url = "https://github.com/int3/vim-extradite.git";
       rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d";
       sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6";
      };
+    meta = {
+      homepage = https://github.com/int3/vim-extradite; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   fugitive = buildVimPlugin {
-    name = "fugitive-git-2014-07-27";
+    name = "fugitive-git-2014-09-02";
     src = fetchgit {
       url = "https://github.com/tpope/vim-fugitive.git";
-      rev = "90ee6fb5d255d14d9f12f2469f92ee50149f5b44";
-      sha256 = "0297512f7fee62af601a99a68617591ecb2e244475ff0d79ebee9c7e6eff2eaf";
+      rev = "0374322ba5d85ae44dd9dc44ef31ca015a59097e";
+      sha256 = "3bb09693726c4f9fc1695bc8b40c45d64a6a0f1d9a4243b4a79add841013ad6c";
      };
+    meta = {
+      homepage = https://github.com/tpope/vim-fugitive; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
-  ghcmod = buildVimPlugin {
-    name = "ghcmod-git-2014-07-16";
+  ghcmod-vim = buildVimPlugin {
+    name = "ghcmod-vim-git-2014-10-19";
     src = fetchgit {
       url = "https://github.com/eagletmt/ghcmod-vim.git";
-      rev = "0c4e94281e57c475752e799adc261f7d5e4ab124";
-      sha256 = "f6a085f7b8198747fae3fff0bc38e4d030e5c97aaeb84958fbf96fa658bbe862";
+      rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9";
+      sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d";
      };
-    patches = [ (fetchurl { url = "https://github.com/eagletmt/ghcmod-vim/pull/57.diff"; md5 = "cafbb9f725afbba26b52b6c3344ee89a"; }) ];
+    meta = {
+      homepage = https://github.com/eagletmt/ghcmod-vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  gist-vim = buildVimPlugin {
+    name = "gist-vim-git-2014-10-19";
+    src = fetchgit {
+      url = "https://github.com/mattn/gist-vim.git";
+      rev = "9265aaa3fb3f090a292c3fb883eab4cea9d2a722";
+      sha256 = "2a1b6c589a60af7acd68f7686d1cbadc60a1da8a407b02d96f86ddfe8bc70c18";
+     };
+    buildInputs = [ zip ];
+    meta = {
+      homepage = https://github.com/mattn/gist-vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  gitgutter = buildVimPlugin {
+    name = "gitgutter-git-2014-10-17";
+    src = fetchgit {
+      url = "https://github.com/airblade/vim-gitgutter.git";
+      rev = "39f011909620e0c7ae555efdace20c3963ac88af";
+      sha256 = "585c367c8cf72d7ef511b3beca3d1eae1d68bbd61b9a8d4dc7aea6e0caa4813a";
+     };
+    meta = {
+      homepage = https://github.com/airblade/vim-gitgutter; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   golang = buildVimPlugin {
-    name = "golang-20131127";
+    name = "golang-git-2014-08-06";
     src = fetchgit {
       url = "https://github.com/jnwhiteh/vim-golang.git";
-      rev = "832d64e5a813511ed52217aa24f0255c49671bab";
-      sha256 = "6858eb674be132477c5dc7f7d3cbe550371f90d1aba480547a614965412a7b3c";
-    };
-    meta = with stdenv.lib; {
-      description = "Vim plugins for Go";
-      homepage    = https://github.com/jnwhiteh/vim-golang;
-      license     = licenses.publicDomain;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
+      rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c";
+      sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af";
+     };
+    meta = {
+      homepage = https://github.com/jnwhiteh/vim-golang; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
   gundo = buildVimPlugin {
-    name = "gundo-git-2013-08-12";
+    name = "gundo-git-2013-08-11";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/Gundo.git";
+      url = "https://github.com/vim-scripts/gundo.git";
       rev = "f443470b96364c24a775629418a6b2562ec9173e";
       sha256 = "b7a949167e59c936d6eae0d23635b87491b2cd2f46a197683b171d30165a90f9";
      };
+    meta = {
+      homepage = https://github.com/vim-scripts/gundo; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  hardtime = buildVimPlugin {
+    name = "hardtime-git-2014-10-21";
+    src = fetchgit {
+      url = "https://github.com/takac/vim-hardtime.git";
+      rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf";
+      sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd";
+     };
+    meta = {
+      homepage = https://github.com/takac/vim-hardtime; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   haskellconceal = buildVimPlugin {
-    name = "haskellconceal-git-2014-05-21";
+    name = "haskellconceal-git-2014-08-07";
     src = fetchgit {
-      url = "https://github.com/begriffs/vim-haskellConceal.git";
-      rev = "73a8d712d3342b2ffdc087b12924f1cf81053860";
-      sha256 = "be60ca030e2d39e972a8c71c0ab3b75b893589d26d5dd78a20cd6779f1f5cfa8";
+      url = "https://github.com/twinside/vim-haskellconceal.git";
+      rev = "1d85e8f10b675d38ec117368ec8032f486c27f98";
+      sha256 = "8ae762939ea435333031a094f3c63e6edd534ac849f0008fa0440440f1f2f633";
      };
+    meta = {
+      homepage = https://github.com/twinside/vim-haskellconceal; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
+
   haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
 
   hasksyn = buildVimPlugin {
-    name = "hasksyn-git-2014-07-24";
+    name = "hasksyn-git-2014-09-03";
     src = fetchgit {
       url = "https://github.com/travitch/hasksyn.git";
-      rev = "175cd4605afa5d9b9c75758112c8159fd118c631";
-      sha256 = "3488e38d1f45a9a3363da62c1c946591621151a0a9cdaedd22b3fe8f666bbdb9";
+      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
+      sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931";
      };
+    meta = {
+      homepage = https://github.com/travitch/hasksyn; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   hdevtools = buildVimPlugin {
@@ -293,59 +418,223 @@ in rec
       rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
       sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
      };
+    meta = {
+      homepage = https://github.com/bitc/vim-hdevtools; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
+  hier = buildVimPlugin {
+    name = "hier-git-2011-08-27";
+    src = fetchgit {
+      url = "https://github.com/jceb/vim-hier.git";
+      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
+      sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785";
+     };
+    buildInputs = [ vim ];
+    meta = {
+      homepage = https://github.com/jceb/vim-hier; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+
   hoogle = buildVimPlugin {
     name = "hoogle-git-2013-11-26";
     src = fetchgit {
-      url = "https://github.com/Twinside/vim-hoogle.git";
+      url = "https://github.com/twinside/vim-hoogle.git";
       rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
       sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
      };
+    meta = {
+      homepage = https://github.com/twinside/vim-hoogle; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  idris-vim = buildVimPlugin {
+    name = "idris-vim-git-2014-10-14";
+    src = fetchgit {
+      url = "https://github.com/idris-hackers/idris-vim.git";
+      rev = "78730e511cae0a067f79da1168466601553f619b";
+      sha256 = "47638b25fa53203e053e27ec6f135fd63ae640edbe37e62d7450a8c434a4cc6b";
+     };
+    meta = {
+      homepage = https://github.com/idris-hackers/idris-vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   ipython = buildVimPlugin {
-    name = "ipython-2013-08-30";
-    src = fetchurl {
-      url    = "https://github.com/ivanov/vim-ipython/archive/ff8f88f3fe518851a91dc88aaa5a75f8f352a960.tar.gz";
-      sha256 = "0hlx526dm8amrvh41kwnmgvvdzs6sh5yc5sfq4nk1zjkfcp1ah5j";
+    name = "ipython-git-2014-07-17";
+    src = fetchgit {
+      url = "https://github.com/ivanov/vim-ipython.git";
+      rev = "9ce4f201ce26e9f01d56a6040ddf9255aab27272";
+      sha256 = "444dede544f9b519143ecc3a6cdfef0c4c32043fc3cd69f92fdcd86c1010e824";
+     };
+    meta = {
+      homepage = https://github.com/ivanov/vim-ipython; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
-    meta = with stdenv.lib; {
-      description = "A two-way integration between vim and iPython";
-      homepage    = https://github.com/ivanov/vim-ipython;
-      repositories.git = https://github.com/ivanov/vim-ipython.git;
-      license     = licenses.publicDomain;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
+  };
+
+  latex-box = buildVimPlugin {
+    name = "latex-box-git-2014-10-05";
+    src = fetchgit {
+      url = "https://github.com/latex-box-team/latex-box.git";
+      rev = "3e000fb161bdf6efe7aef517aef276554aeabb65";
+      sha256 = "462803aceec5904943074e11888482ef6c49c8a5e26d6728ebcb2c4f5dbbb6a4";
+     };
+    meta = {
+      homepage = https://github.com/latex-box-team/latex-box; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  latex-live-preview = buildVimPlugin {
+    name = "latex-live-preview-git-2013-11-25";
+    src = fetchgit {
+      url = "https://github.com/xuhdev/vim-latex-live-preview.git";
+      rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c";
+      sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722";
+     };
+    meta = {
+      homepage = https://github.com/xuhdev/vim-latex-live-preview; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  lushtags = buildVimPlugin {
+    name = "lushtags-git-2013-12-27";
+    src = fetchgit {
+      url = "https://github.com/bitc/lushtags.git";
+      rev = "429fab3b748ae04ee5de0cbf75d947f15441e798";
+      sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7";
+     };
+    meta = {
+      homepage = https://github.com/bitc/lushtags; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
   neco-ghc = buildVimPlugin {
-    name = "neco-ghc-git-2014-08-09";
+    name = "neco-ghc-git-2014-10-17";
     src = fetchgit {
       url = "https://github.com/eagletmt/neco-ghc.git";
-      rev = "0311f31b3acaccec5b651ae7089d627a3a49239b";
-      sha256 = "302f29f54c56e9cee647745a8355aeafe323c4efe2f3593d5e4f586acc1c06a5";
+      rev = "fffdf57dcb312f874a43a202157b5efecfe3d9de";
+      sha256 = "464b24e3151ebaf0e95c25f09cb047e2542d5dd9100087e538d0a5e46bd0e638";
      };
+    meta = {
+      homepage = https://github.com/eagletmt/neco-ghc; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
+
   necoGhc = neco-ghc; # backwards compat, added 2014-10-18
 
+  nerdcommenter = buildVimPlugin {
+    name = "nerdcommenter-git-2014-07-08";
+    src = fetchgit {
+      url = "https://github.com/scrooloose/nerdcommenter.git";
+      rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
+      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
+     };
+    meta = {
+      homepage = https://github.com/scrooloose/nerdcommenter; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
   nerdtree = buildVimPlugin {
-    name = "nerdtree-git-2014-08-16";
+    name = "nerdtree-git-2014-08-06";
     src = fetchgit {
       url = "https://github.com/scrooloose/nerdtree.git";
       rev = "4f1e6ecb057fc0bac189171c1430d71ef25f6bb1";
       sha256 = "67ff2e7b9a7f39e58e9e334b1b79343a4c11aae10a657ab4fece289d8fe59300";
      };
+    meta = {
+      homepage = https://github.com/scrooloose/nerdtree; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   pathogen = buildVimPlugin {
-    name = "pathogen-git-2014-07-20";
+    name = "pathogen-git-2014-07-19";
     src = fetchgit {
       url = "https://github.com/tpope/vim-pathogen.git";
       rev = "91e6378908721d20514bbe5d18d292a0a15faf0c";
       sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f";
      };
+    meta = {
+      homepage = https://github.com/tpope/vim-pathogen; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  quickfixstatus = buildVimPlugin {
+    name = "quickfixstatus-git-2011-09-02";
+    src = fetchgit {
+      url = "https://github.com/dannyob/quickfixstatus.git";
+      rev = "fd3875b914fc51bbefefa8c4995588c088163053";
+      sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b";
+     };
+    meta = {
+      homepage = https://github.com/dannyob/quickfixstatus; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  quickrun = buildVimPlugin {
+    name = "quickrun-git-2014-10-08";
+    src = fetchgit {
+      url = "https://github.com/thinca/vim-quickrun.git";
+      rev = "ae97cef42ae142306e9431dce9ab97c4353e5254";
+      sha256 = "3219fadb3732c895c82b8bcff1d6e86f0917cd5ac7bf34180c27bb3f75ed1787";
+     };
+    meta = {
+      homepage = https://github.com/thinca/vim-quickrun; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+
+  rainbow_parentheses = buildVimPlugin {
+    name = "rainbow_parentheses-git-2013-03-04";
+    src = fetchgit {
+      url = "https://github.com/kien/rainbow_parentheses.vim.git";
+      rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
+      sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3";
+     };
+    meta = {
+      homepage = https://github.com/kien/rainbow_parentheses.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  rust = buildVimPlugin {
+    name = "rust-git-2014-10-15";
+    src = fetchgit {
+      url = "https://github.com/wting/rust.vim.git";
+      rev = "aaeb7b51f1b188fb1edc29c3a3824053b3e5e265";
+      sha256 = "be858b1e2cb0b37091a3d79a51e264b3101229b007cfc16bcd28c740f3823c01";
+     };
+    meta = {
+      homepage = https://github.com/wting/rust.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  shabadou = buildVimPlugin {
+    name = "shabadou-git-2014-07-27";
+    src = fetchgit {
+      url = "https://github.com/osyo-manga/shabadou.vim.git";
+      rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a";
+      sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6";
+     };
+    meta = {
+      homepage = https://github.com/osyo-manga/shabadou.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   stylish-haskell = buildVimPlugin {
@@ -355,53 +644,116 @@ in rec
       rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75";
       sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c";
      };
+    meta = {
+      homepage = https://github.com/nbouscal/vim-stylish-haskell; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
+
   stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
 
   supertab = buildVimPlugin {
-    name = "supertab-git-2014-08-07";
+    name = "supertab-git-2014-10-17";
     src = fetchgit {
       url = "https://github.com/ervandew/supertab.git";
-      rev = "23db558596d4a73e4afa8fbedcde23b95bf72251";
-      sha256 = "21fa675969f4cfd2686ab3b63cba632fa55d62481e61d36193403bea9c02ebde";
+      rev = "fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7";
+      sha256 = "5919521b95519d4baa8ed146c340ca739fa7f31dfd305c74ca0ace324ba93d74";
      };
     buildInputs = [ vim ];
+    meta = {
+      homepage = https://github.com/ervandew/supertab; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
-  syntastic = buildVimPlugin rec {
-    version = "3.4.0";
-    name    = "syntastic-${version}";
+  surround = buildVimPlugin {
+    name = "surround-git-2014-07-26";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-surround.git";
+      rev = "fa433e0b7330753688f715f3be5d10dc480f20e5";
+      sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d";
+     };
+    meta = {
+      homepage = https://github.com/tpope/vim-surround; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
 
-    src = fetchurl {
-      url    = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz";
-      sha256 = "0h8vfs6icpfwc41qx6n6rc1m35haxp2gaswg9fhcki2w2ikp6knb";
+  signature = buildVimPlugin {
+    name = "signature-git-2014-10-17";
+    src = fetchgit {
+      url = "https://github.com/kshenoy/vim-signature.git";
+      rev = "f012d6f4d288ef6006f61b06f5240bc461a1f89e";
+      sha256 = "bef5254e343758d609856c745fe9d83639546f3af4ca50542429c1cb91ab577a";
+     };
+    meta = {
+      homepage = https://github.com/kshenoy/vim-signature; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  syntastic = buildVimPlugin {
+    name = "syntastic-git-2014-10-17";
+    src = fetchgit {
+      url = "https://github.com/scrooloose/syntastic.git";
+      rev = "77c125170aa6b8c553d58f876021b0cedd8ac820";
+      sha256 = "ec9b1e22134cb16d07bef842be26b4f1f74a9f8b9a0afd9ab771ff79935920af";
+     };
+    meta = {
+      homepage = https://github.com/scrooloose/syntastic; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  table-mode = buildVimPlugin {
+    name = "table-mode-git-2014-09-17";
+    src = fetchgit {
+      url = "https://github.com/dhruvasagar/vim-table-mode.git";
+      rev = "ef0eef0f35f2ca172907f6d696dc8859acd8a0da";
+      sha256 = "0377059972580f621f1bb4b35738e0e00d386b23d839115e8c5fa8fd3acbc98d";
+     };
+    meta = {
+      homepage = https://github.com/dhruvasagar/vim-table-mode; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  tabmerge = buildVimPlugin {
+    name = "tabmerge-git-2010-10-17";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/tabmerge.git";
+      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
+      sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f";
+     };
+    meta = {
+      homepage = https://github.com/vim-scripts/tabmerge; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
   tabular = buildVimPlugin {
-    name = "tabular-git-2013-05-17";
+    name = "tabular-git-2013-05-16";
     src = fetchgit {
       url = "https://github.com/godlygeek/tabular.git";
       rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
       sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
      };
+    meta = {
+      homepage = https://github.com/godlygeek/tabular; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
-  tagbar = buildVimPlugin rec {
-    version = "2.6.1";
-    name    = "tagbar-${version}";
-
-    meta = with stdenv.lib; {
-      description = "A vim plugin for browsing the tags of source code files";
-      homepage    = https://github.com/majutsushi/tagbar;
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-
-    src = fetchurl {
-      url    = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz";
-      sha256 = "c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb";
+  tagbar = buildVimPlugin {
+    name = "tagbar-git-2014-10-14";
+    src = fetchgit {
+      url = "https://github.com/majutsushi/tagbar.git";
+      rev = "64e935fe5812d3b7022aba1dee63ec9f7456b02f";
+      sha256 = "2a66b86328e395bd594c8673a6420307a32468e4040dafe2b877ad4afcf6b7f9";
+     };
+    meta = {
+      homepage = https://github.com/majutsushi/tagbar; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
   };
 
@@ -428,14 +780,32 @@ in rec
     buildInputs = [ unzip ];
   };
 
+  thumbnail = buildVimPlugin {
+    name = "thumbnail-git-2014-07-24";
+    src = fetchgit {
+      url = "https://github.com/itchyny/thumbnail.vim.git";
+      rev = "e59a1791862ed470510a58456cc001226e177a39";
+      sha256 = "f36d915804e36b5f2dcea7db481da97ec60d0c90df87599a5d5499e649d97f66";
+     };
+    meta = {
+      homepage = https://github.com/itchyny/thumbnail.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
   tmux-navigator = buildVimPlugin {
-    name = "tmux-navigator-git-2014-07-22";
+    name = "tmux-navigator-git-2014-09-09";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator.git";
-      rev = "3de98bfcee1289ce8edc6daf9a18f243180c7168";
-      sha256 = "3843f92e0a21fe5ccf613f8a561abd06c822b2ee98bd82c98937548144e4e8df";
+      rev = "195cdf087fea7beaf6274d0a655d157dfab3130c";
+      sha256 = "4235c2bfb64a9094b854cdd7303a64bbb994717f24704911c4b358b2373dfaa9";
      };
+    meta = {
+      homepage = https://github.com/christoomey/vim-tmux-navigator; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
+
   tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
 
   tslime = buildVimPlugin {
@@ -445,42 +815,82 @@ in rec
       rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd";
       sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251";
      };
+    meta = {
+      homepage = https://github.com/jgdavey/tslime.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   ultisnips = buildVimPlugin {
-    name = "ultisnips-git-2014-08-02";
+    name = "ultisnips-git-2014-10-11";
     src = fetchgit {
-      url = "https://github.com/SirVer/ultisnips.git";
-      rev = "279d6e63c9a8dbaa20ffc43c3c5f057dfc8f1121";
-      sha256 = "f8d93849ef2bce798aa599ba860694ced37d12450010a48dd6bd3004bc52b503";
+      url = "https://github.com/sirver/ultisnips.git";
+      rev = "1ad970379edaec1a386bab5ff26c385b9e89a0ff";
+      sha256 = "5d6858a153d79f596513d01d4ed9cd6dcff853e2c42c4b4546d38bd15423af98";
      };
+    meta = {
+      homepage = https://github.com/sirver/ultisnips; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
-  vimproc = buildVimPlugin rec {
-    version = "21a79bf4edca3ae97555df3fc729d208c7e19b9c";
-    name    = "vimproc-${version}";
-
-    meta = with stdenv.lib; {
-      description = "An asynchronous execution library for Vim";
-      homepage    = https://github.com/Shougo/vimproc.vim;
-      repositories.git = https://github.com/Shougo/vimproc.vim.git;
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-
+  undotree = buildVimPlugin {
+    name = "undotree-git-2014-09-17";
     src = fetchgit {
-      url = "https://github.com/Shougo/vimproc.vim.git";
-      rev = "${version}";
-      sha256 = "16mlrhmd1hq4rgg7bl9gajhb4nmn1x8jxfaxfwiy2bm1phgljgq0";
+      url = "https://github.com/mbbill/undotree.git";
+      rev = "14655d87774b1f35b5bd23c6de64f535d90ed48d";
+      sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520";
      };
+    meta = {
+      homepage = https://github.com/mbbill/undotree; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
 
+  vim2hs = buildVimPlugin {
+    name = "vim2hs-git-2014-04-16";
+    src = fetchgit {
+      url = "https://github.com/dag/vim2hs.git";
+      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
+      sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
+     };
+    meta = {
+      homepage = https://github.com/dag/vim2hs; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  vimoutliner = buildVimPlugin {
+    name = "vimoutliner-git-2014-10-20";
+    src = fetchgit {
+      url = "https://github.com/vimoutliner/vimoutliner.git";
+      rev = "4e924d9e42b6955a696e087d22795f5fe0e6c857";
+      sha256 = "6a9a27526c51202fb15374b40c5a759df0e10977dbe3045dabef0439c3e62c72";
+     };
+    meta = {
+      homepage = https://github.com/vimoutliner/vimoutliner; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  vimproc = buildVimPlugin {
+    name = "vimproc-git-2014-10-03";
+    src = fetchgit {
+      url = "https://github.com/shougo/vimproc.vim.git";
+      rev = "3e055023dfab4f5a4dfa05a834f9d0cb7294a82e";
+      sha256 = "63c2786897e8315eed2473822879b7ceb847e6021695a861892d7b9ab15a69fb";
+     };
     buildInputs = [ which ];
 
     buildPhase = ''
       sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim
       make -f make_unix.mak
     '';
+
+    meta = {
+      homepage = https://github.com/shougo/vimproc.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   vimshell = buildVimPlugin rec {
@@ -510,50 +920,71 @@ in rec
     '';
   };
 
-  vimoutliner = buildVimPlugin {
-    name = "vimoutliner-git-2014-09-20";
-    src = fetchgit {
-      url = "https://github.com/vimoutliner/vimoutliner";
-      rev = "2fc82976683c8770bece157ae3ada55251b6ddeb";
-      sha256 = "dce383e7842c42bcfa8e7c3329fa426cb0fb05786d40a733da705c03aabd196b";
-     };
-  };
-
-  vim2hs = buildVimPlugin {
-    name = "vim2hs-git-2014-04-16";
-    src = fetchgit {
-      url = "https://github.com/dag/vim2hs.git";
-      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
-      sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
-     };
-  };
-
   vundle = buildVimPlugin {
-    name = "vundle-git-2014-07-19";
+    name = "vundle-git-2014-07-18";
     src = fetchgit {
-      url = "https://github.com/gmarik/Vundle.vim.git";
+      url = "https://github.com/gmarik/vundle.vim.git";
       rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab";
       sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204";
      };
+    meta = {
+      homepage = https://github.com/gmarik/vundle.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  watchdogs = buildVimPlugin {
+    name = "watchdogs-git-2014-10-18";
+    src = fetchgit {
+      url = "https://github.com/osyo-manga/vim-watchdogs.git";
+      rev = "ad222796eb88b44954340c19c39938046af26e05";
+      sha256 = "4c621ac2834864cf0c46f776029837913e1ba0c725a12d7cb24bf92e04ed1279";
+     };
+    meta = {
+      homepage = https://github.com/osyo-manga/vim-watchdogs; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
+  };
+
+  webapi-vim = buildVimPlugin {
+    name = "webapi-vim-git-2014-10-19";
+    src = fetchgit {
+      url = "https://github.com/mattn/webapi-vim.git";
+      rev = "99e11199838ccbeb7213cbc30698200170d355c9";
+      sha256 = "599e282ef45bf6587c34579ab08d4e4a1f2cb54589e1e386c75d701880c90b9e";
+     };
+    buildInputs = [ zip ];
+    meta = {
+      homepage = https://github.com/mattn/webapi-vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   wombat256 = buildVimPlugin {
-    name = "wombat256-git-2010-10-18";
+    name = "wombat256-git-2010-10-17";
     src = fetchgit {
       url = "https://github.com/vim-scripts/wombat256.vim.git";
       rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
       sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
      };
+    meta = {
+      homepage = https://github.com/vim-scripts/wombat256.vim; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
-
   xdebug = buildVimPlugin {
-    name = "xdebug-2012-08-15";
-    src = fetchurl {
-      url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz";
-      sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk";
-    };
+    name = "xdebug-git-2012-08-15";
+    src = fetchgit {
+      url = "https://github.com/joonty/vim-xdebug.git";
+      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
+      sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2";
+     };
     postInstall = false;
+    meta = {
+      homepage = https://github.com/joonty/vim-xdebug; 
+      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    };
   };
 
   yankring = buildVimPlugin rec {
@@ -581,11 +1012,12 @@ in rec
   youcompleteme = stdenv.mkDerivation {
     src = fetchgit {
       url = "https://github.com/Valloric/YouCompleteMe.git";
-      rev = "a2cae90f7ba1746bf1209edd6739f87d5914b375";
-      sha256 = "1yxrxskxnr2da5awm59ra4s9wg67rimcbazvln9bayg9saxs540d";
-    };
+      rev = "87b42c689391b69968950ae99c3aaacf2e14c329";
+      sha256 = "1f3pywv8bsqyyakvyarg7z9m73gmvp1lfbfp2f2jj73jmmlzb2kv";
+     };
+
+    name = "vimplugin-youcompleteme-2014-10-06";
 
-    name = "vimplugin-youcompleteme-20140929";  # commit date
     buildInputs = [ python cmake clang.clang ];
 
     configurePhase = ":";
@@ -619,5 +1051,7 @@ in rec
       platforms = stdenv.lib.platforms.linux;
     };
   };
+
   YouCompleteMe = youcompleteme; # backwards compat, added 2014-10-18
+
 }