Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

16 files changed, 414 insertions, 225 deletions

diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index fc297ca9553c..4a902b640cb5 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "apulse-${version}";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "apulse";
     rev = "v${version}";
-    sha256 = "0b384dr415flxk3n4abfwfljlh7vvr1g9gad15zc5fgbyxsinv12";
+    sha256 = "1w0mqa8gcrvvlns3pryhmlsc0g1irdnwsawx4g34wgwrp9paqqzm";
   };
 
   buildInputs =
diff --git a/pkgs/misc/cups/drivers/mfcj470dw/default.nix b/pkgs/misc/cups/drivers/mfcj470dw/default.nix
new file mode 100644
index 000000000000..d1a1b239371a
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcj470dw/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, bash, file }:
+
+stdenv.mkDerivation rec {
+  name = "mfcj470dw-cupswrapper-${version}";
+  version = "3.0.0-1";
+
+  srcs =
+    [ (fetchurl {
+        url = "http://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb";
+        sha256 = "7202dd895d38d50bb767080f2995ed350eed99bc2b7871452c3c915c8eefc30a";
+      })
+      (fetchurl {
+        url = "http://download.brother.com/welcome/dlf006845/mfcj470dwcupswrapper-${version}.i386.deb";
+        sha256 = "92af9024e821159eccd78a8925fc77fb92b4f247f2d2c824ca303004077076a7";
+      })
+    ];
+
+  buildInputs = [ dpkg cups patchelf bash ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    for s in $srcs; do dpkg-deb -x $s $out; done
+
+    substituteInPlace $out/opt/brother/Printers/mfcj470dw/cupswrapper/cupswrappermfcj470dw \
+      --replace /opt "$out/opt" \
+      --replace /usr "$out/usr" \
+      --replace /etc "$out/etc"
+
+    substituteInPlace $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \
+      --replace /opt "$out/opt" \
+      --replace file "/run/current-system/sw/bin/file"
+
+    sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2
+
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
+
+    mkdir -p $out/lib/cups/filter/
+    ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw
+  '';
+
+  meta = {
+    homepage = http://www.brother.com/;
+    description = "A driver for brother mfcj470dw printers to print over WiFi and USB";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128;
+  };
+}
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index a860273e9eb5..b4b3a5a06247 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -10,11 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
   };
 
-  patches = [(fetchpatch { # drop on update
-    name = "poppler-0.34.patch";
-    url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
-    sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
-  })];
+  patches = [
+    ./longer-shell-path.patch
+    (fetchpatch { # drop on update
+      name = "poppler-0.34.patch";
+      url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
+      sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
+    })
+  ];
 
   buildInputs = [
     pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch
new file mode 100644
index 000000000000..397cc681732b
--- /dev/null
+++ b/pkgs/misc/cups/longer-shell-path.patch
@@ -0,0 +1,13 @@
+diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
+index 90a851c..689a2bd 100644
+--- a/filter/foomatic-rip/foomaticrip.c
++++ b/filter/foomatic-rip/foomaticrip.c
+@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
+                                 "/opt/cups/filter:"
+                                 "/usr/lib/cups/filter";
+
+-char modern_shell[64] = SHELL;
++char modern_shell[] = SHELL;
+
+ void config_set_option(const char *key, const char *value)
+ {
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 28ae8b25ca73..e381ea6b3e3a 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -35,6 +35,8 @@ let
       "arm7l-linux" = "arm32";
     }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}");
 
+    platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
+
 in
 
 stdenv.mkDerivation {
@@ -99,7 +101,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   postInstall =
-    (stdenv.lib.optionalString withPlugin
+    (stdenv.lib.optionalString (withPlugin && builtins.elem stdenv.system platforms)
     (let hplip_arch =
           if stdenv.system == "i686-linux" then "x86_32"
           else if stdenv.system == "x86_64-linux" then "x86_64"
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 2775150385de..697183db3b73 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.7.48";
-    wineSha256  = "13kcjirif57p8mg4yhzxf0hjpghlwc18iskz66dx94i0dvjmrxg3";
+    wineVersion = "1.7.52";
+    wineSha256  = "0jsm1p7zwhfb5fpp0xd39vnx9m98kqgfng1q9kdj70rm1hmb6wq7";
     geckoVersion = "2.36";
     geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
     gecko64Version = "2.36";
@@ -20,11 +20,11 @@
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   staging = {
-    version = "1.7.48";
-    sha256 = "06p1h92vaqlzk09aj4na6z7k3a81y9nw19rfg9q2szpcqjdd437w";
+    version = "1.7.52";
+    sha256 = "12r100gv34k44kia14wrfa42q0cjd8ir8vi8cx1b6hgnzw3x0gzk";
   };
   winetricks = {
-    version = "20150706";
-    sha256 = "1n9xbav4q0dpfdmmjcahi4izyhvy2f7ddrq7gyhrm6pxs2zli888";
+    version = "20151110";
+    sha256 = "1aq8rkqq8mdksb5c4gc3k9plh3zc28gffi7y29v9vyk4f25j64sz";
   };
 }
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 29bb9d7d6800..21df615d6616 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -29,8 +29,11 @@ stdenv.mkDerivation rec{
 
   postInstall = ''
     for f in "$out/bin/"*; do
+        # Override default argv[0] setting so LilyPond can find
+        # its Scheme libraries.
         wrapProgram "$f" --set GUILE_AUTO_COMPILE 0 \
-                         --set PATH "${ghostscript}/bin"
+                         --set PATH "${ghostscript}/bin" \
+                         --argv0 "$f"
     done
   '';
 
@@ -49,7 +52,7 @@ stdenv.mkDerivation rec{
     homepage = http://lilypond.org/;
     license = licenses.gpl3;
     maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 
   patches = [ ./findlib.patch ];
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
new file mode 100644
index 000000000000..8ff4a1074e61
--- /dev/null
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgs }:
+
+stdenv.mkDerivation rec {
+  name = "pipes-${version}";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz";
+    sha256 = "1225llbm0zfnkqykfi7qz7z5p102pwldmj22761m653jy0ahi7w2";
+  };
+
+  buildInputs = with pkgs; [ bash ];
+
+  installPhase = ''
+    mkdir $out -p
+    make PREFIX=$out/ install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/pipeseroni/pipes.sh";
+    description = "Animated pipes terminal screensaver";
+    license = licenses.mit;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index a00c0b5365a1..2b3b05ceda1e 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec
 {
-  version = "4.0.6";
+  version = "4.4.2";
   name = "seafile-shared-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "1vs1ckxkh0kg1wjklpwdz87d5z60r80q27xv1s6yl7ir65s6zq0i";
+    sha256 = "00sflvyap3nw38qblpagp2japgp83sqc5s4r336mi6475grgmnyi";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
new file mode 100644
index 000000000000..e61a1327a82b
--- /dev/null
+++ b/pkgs/misc/themes/arc/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, autoconf, automake, fetchFromGitHub, gnome3, gtk, gtk-engine-murrine, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  version = "2015-10-21";
+  name = "arc-gtk-theme-git-${version}";
+  src = fetchFromGitHub {
+    owner = "horst3180";
+    repo = "arc-theme";
+    sha256 = "09s452ysg5ys5i3ahb2dgdmr9j64b92hy9rgfvbgw6r5kdrnb60s";
+    rev = "f4c71247cf9470037d052ae4a12b86073d0001ff";
+  };
+
+  preferLocalBuild = true;
+
+  buildInputs = [ autoconf automake gtk-engine-murrine pkgconfig ];
+
+  configureScript = "./autogen.sh";
+  configureFlags = "--with-gnome=${gnome3.version}";
+
+  meta = with stdenv.lib; {
+    description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
+    homepage = "https://github.com/horst3180/Arc-theme";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.simonvandel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix
new file mode 100644
index 000000000000..c7cf3a871b58
--- /dev/null
+++ b/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, gtk }:
+
+stdenv.mkDerivation rec {
+  version = "6a5f14cfe697b0a829456a1fd560acdcddc6043f";
+  name = "paper-gtk-theme-${version}";
+
+  src = fetchFromGitHub {
+    owner = "snwh";
+    repo = "paper-gtk-theme";
+    sha256 = "0kyn3a6sq0z22vds6szl630jv20pjskjbdg0wc8abxzwg0vwxc5m";
+    rev = version;
+  };
+
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/share/themes/Paper/
+    cp -r ./Paper/ $out/share/themes/
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
+    homepage = "http://snwh.org/paper/";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.simonvandel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index d1c81e0af483..60269c8dfbf6 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "theme-vertex-${version}";
-  version = "20150718";
+  version = "20150923";
 
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "Vertex-theme";
     rev = version;
-    sha256 = "19mmybfkx3mrbm9vr78c7xiyazmyzji1n6669466svjr3jy87546";
+    sha256 = "0jsdnrw7sgrb7s4byv80y9c782gd6vbq0xsrrhwkflfnxcldvz4r";
   };
 
   buildInputs = [ autoreconfHook gtk3 pkgconfig ];
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4fe6ae4c6e22..443841363bf3 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -22,11 +22,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uboot-${defconfig}-${version}";
-  version = "2015.07";
+  version = "2015.10";
 
   src = fetchurl {
     url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-    sha256 = "1nclmyii5a1igvgjc4kxvi1fk2y82hp2iy4iywp34b3zf6ywjj0b";
+    sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx";
   };
 
   patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
index ce057b6aa657..218132c7758e 100644
--- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
+++ b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
@@ -1,4 +1,4 @@
-From 1fb764e1866513a69b4a0c29b69f8e78ea1df7fa Mon Sep 17 00:00:00 2001
+From 98f62c27fe481dc2d444d70265268d2369d8a998 Mon Sep 17 00:00:00 2001
 From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
 Date: Mon, 8 Jun 2015 22:29:23 +0300
 Subject: [PATCH] vexpress: Use config_distro_bootcmd
@@ -8,12 +8,11 @@ cli_readline_into_buffer doesn't respect the timeout.
 ---
  common/cli_readline.c             | 12 +++++++++++-
  configs/vexpress_ca9x4_defconfig  |  2 --
- include/configs/vexpress_ca9x4.h  |  1 -
- include/configs/vexpress_common.h | 34 ++++++++++++++++++++++------------
- 4 files changed, 33 insertions(+), 16 deletions(-)
+ include/configs/vexpress_common.h |  2 +-
+ 3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/common/cli_readline.c b/common/cli_readline.c
-index 9a9fb35..ca997a9 100644
+index c1476e4..5063a0a 100644
 --- a/common/cli_readline.c
 +++ b/common/cli_readline.c
 @@ -517,6 +517,7 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
@@ -58,100 +57,26 @@ index 2947fc1..9a5123d 100644
  # CONFIG_CMD_ITEST is not set
  # CONFIG_CMD_SETEXPR is not set
  # CONFIG_CMD_NFS is not set
-diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
-index 38ac4ed..993398c 100644
---- a/include/configs/vexpress_ca9x4.h
-+++ b/include/configs/vexpress_ca9x4.h
-@@ -13,6 +13,5 @@
- 
- #define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
- #include "vexpress_common.h"
--#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca9x4"
- 
- #endif /* VEXPRESS_CA9X4_H */
 diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
-index 0c1da01..72850d0 100644
+index 98f6ae9..062532a 100644
 --- a/include/configs/vexpress_common.h
 +++ b/include/configs/vexpress_common.h
-@@ -123,7 +123,6 @@
- #define CONFIG_SYS_L2CACHE_OFF		1
- #define CONFIG_INITRD_TAG		1
- #define CONFIG_SYS_GENERIC_BOARD
--#define CONFIG_OF_LIBFDT		1
- 
- /* Size of malloc() pool */
- #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
-@@ -152,6 +151,7 @@
- #define CONFIG_SYS_SERIAL0		V2M_UART0
- #define CONFIG_SYS_SERIAL1		V2M_UART1
- 
-+#include <config_distro_defaults.h>
- /* Command line configuration */
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_PXE
-@@ -163,7 +163,6 @@
- #define CONFIG_SUPPORT_RAW_INITRD
- 
- #define CONFIG_CMD_FAT
--#define CONFIG_DOS_PARTITION		1
- #define CONFIG_MMC			1
- #define CONFIG_CMD_MMC
- #define CONFIG_GENERIC_MMC
-@@ -201,17 +200,28 @@
+@@ -185,7 +185,6 @@
+ 					 CONFIG_SYS_INIT_RAM_SIZE - \
  					 GENERATED_GBL_DATA_SIZE)
  #define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SYS_GBL_DATA_OFFSET
+-#define CONFIG_CMD_ECHO
  
-+#define BOOT_TARGET_DEVICES(func) \
-+	func(MMC, mmc, 0)
-+#include <config_distro_bootcmd.h>
-+
- /* Basic environment settings */
--#define CONFIG_BOOTCOMMAND		"run bootflash;"
- #ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
-+/*
-+ * RAM starts at 0x6000_0000
-+ *  - U-Boot loaded @ 8M
-+ *  - Kernel loaded @ 32M
-+ *  - Initrd loaded @ 128M
-+ *  - DTB    loaded @ 240M
-+ */
- #define CONFIG_PLATFORM_ENV_SETTINGS \
--		"loadaddr=0x80008000\0" \
--		"ramdisk_addr_r=0x61000000\0" \
--		"kernel_addr=0x44100000\0" \
--		"ramdisk_addr=0x44800000\0" \
--		"maxramdisk=0x1800000\0" \
--		"pxefile_addr_r=0x88000000\0" \
--		"kernel_addr_r=0x80008000\0"
-+		"fdtfile=vexpress-v2p-ca9.dtb\0" \
-+		"kernel_addr_r=0x62000000\0" \
-+		"ramdisk_addr_r=0x68000000\0" \
-+		"maxramdisk=0x06000000\0" \
-+		"fdt_addr_r=0x6f000000\0" \
-+		"loadaddr=0x70000000\0" \
-+		"pxefile_addr_r=0x71000000\0" \
-+		"scriptaddr=0x72000000\0"
- #elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP)
- #define CONFIG_PLATFORM_ENV_SETTINGS \
- 		"loadaddr=0xa0008000\0" \
-@@ -234,7 +244,8 @@
- 			"devtmpfs.mount=0  vmalloc=256M\0" \
- 		"bootflash=run flashargs; " \
- 			"cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
--			"bootm ${kernel_addr} ${ramdisk_addr_r}\0"
-+			"bootm ${kernel_addr} ${ramdisk_addr_r}\0" \
-+                BOOTENV
- 
- /* FLASH and environment organization */
- #define PHYS_FLASH_SIZE			0x04000000	/* 64MB */
-@@ -287,7 +298,6 @@
+ #include <config_distro_defaults.h>
  
- #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
- #define CONFIG_SYS_LONGHELP
--#define CONFIG_CMDLINE_EDITING		1
- #define CONFIG_SYS_MAXARGS		16	/* max command args */
- 
- #endif /* VEXPRESS_COMMON_H */
+@@ -225,6 +224,7 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 		CONFIG_PLATFORM_ENV_SETTINGS \
+                 BOOTENV \
++		"fdtfile=vexpress-v2p-ca9.dtb\0" \
+ 		"console=ttyAMA0,38400n8\0" \
+ 		"dram=1024M\0" \
+ 		"root=/dev/sda1 rw\0" \
 -- 
-2.4.5
+2.6.0
 
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 4d25b5b73b20..fe393753f24f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -47,13 +47,15 @@ rec {
   colorsamplerpack    = Colour_Sampler_Pack;
   command_T           = command-t; # backwards compat, added 2014-10-18
   css_color_5056      = vim-css-color;
+  ctrlp               = ctrlp-vim;
   easy-align          = vim-easy-align;
   easymotion          = vim-easymotion;
   eighties            = vim-eighties;
   ghc-mod-vim         = ghcmod;
   gist-vim            = Gist;
   gitgutter           = vim-gitgutter;
-  gundo               = Gundo;
+  gundo               = gundo-vim;
+  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
   haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
   haskellconceal      = vim-haskellconceal;
   hier                = vim-hier;
@@ -118,17 +120,6 @@ rec {
 
   };
 
-  Gundo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gundo";
-    src = fetchhg {
-      url = "https://bitbucket.org/sjl/gundo.vim";
-      rev = "eb9fc8676b89";
-      sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp";
-    };
-    dependencies = [];
-
-  };
-
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Hoogle-2013-11-26";
     src = fetchgit {
@@ -163,11 +154,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-09-21";
+    name = "Syntastic-2015-10-02";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "d73d7601ccb79ac94447b3c661ed5de2801d3977";
-      sha256 = "64a03f457d008d66ec913296b15bd5590cca9bf339ac149af42318e99157a8d0";
+      rev = "7e26d3589ab414155dff2c362a07e9e8bb970823";
+      sha256 = "3878a0d2664eac37c033985d725c8606bb6c1796cf94d36ffe85197bf1df8b24";
     };
     dependencies = [];
 
@@ -229,11 +220,11 @@ rec {
   };
 
   VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2015-01-09";
+    name = "VimOutliner-2015-10-01";
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
-      rev = "7c995f973c54b0d026137615af28059890edb197";
-      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
+      rev = "cb41cfd6d636e1243e7e9c46b35fc5cb50588069";
+      sha256 = "6faf7e34f4793b2445dd9c3facbf19cd6c1c9ab39b83dfb3d89626314ef1850f";
     };
     dependencies = [];
 
@@ -277,17 +268,6 @@ rec {
 
   };
 
-  ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-2013-07-29";
-    src = fetchgit {
-      url = "git://github.com/kien/ctrlp.vim";
-      rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
-      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
-    };
-    dependencies = [];
-
-  };
-
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ctrlp-py-matcher-2015-07-18";
     src = fetchgit {
@@ -311,22 +291,22 @@ rec {
   };
 
   extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "extradite-2015-01-26";
+    name = "extradite-2015-09-22";
     src = fetchgit {
       url = "git://github.com/int3/vim-extradite";
-      rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
-      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
+      rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526";
+      sha256 = "91f744ee73faad92adb67a698b58a14cfa0fbb65f6d483a96a1c5b139ee1cdf1";
     };
     dependencies = [];
 
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-09-10";
+    name = "fugitive-2015-10-02";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "b7b23001def8d2ae816ff6dd772cd50976189e0e";
-      sha256 = "737def8b596472908509bdfaf8d33111471fb1a2d692133ce16f03548e226672";
+      rev = "0b43b51d7785aeb4002b45ca49cea5aef0d2e988";
+      sha256 = "8b6002169ec54487951680c67e618b2bfdf04cc0d430eb1149917f82277fc20f";
     };
     dependencies = [];
 
@@ -354,12 +334,34 @@ rec {
 
   };
 
+  vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-nix-2015-05-10";
+    src = fetchgit {
+      url = "git://github.com/LnL7/vim-nix";
+      rev = "39f5eb681f2ed2282ed562af2d6a2e40712d8429";
+      sha256 = "6f109b6949f773b2d7f06adeb45334fa61479c95750666b450265851cb24c761";
+    };
+    dependencies = [];
+
+  };
+
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2015-06-22";
+    name = "vim-css-color-2015-10-03";
     src = fetchgit {
       url = "git://github.com/ap/vim-css-color";
-      rev = "ceb028b27eae0550533501b1f02cb512a482ba85";
-      sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd";
+      rev = "7ad79c7b77bd83296d7a10e596860d9269070207";
+      sha256 = "bd6ad1ddad9d520c018083bab8eb53575f99572f3e079abad452db0bf8871708";
+    };
+    dependencies = [];
+
+  };
+
+  neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neomake-2015-09-29";
+    src = fetchgit {
+      url = "git://github.com/benekastah/neomake";
+      rev = "dc65a7a5d85670c84fc0055d19fa6901ae96ef93";
+      sha256 = "967559156af1f06e345c04a4df9e3ab6a0e913e56ff2a66189a91a5c57c4f668";
     };
     dependencies = [];
 
@@ -387,6 +389,17 @@ rec {
 
   };
 
+  ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-vim-2015-09-15";
+    src = fetchgit {
+      url = "git://github.com/ctrlpvim/ctrlp.vim";
+      rev = "58247bdf8550879e183c13860eefa03983959e4a";
+      sha256 = "1d4cf293a1e48564a491e00077794e23f5360827a72c2618fd3e99ee153ea6a8";
+    };
+    dependencies = [];
+
+  };
+
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jade-2015-07-06";
     src = fetchgit {
@@ -399,11 +412,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2015-09-20";
+    name = "neco-ghc-2015-10-03";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "c5b47167b29ad5887332567edc655433d32642bd";
-      sha256 = "c8e7a746cb4b2faba15dd11a6c9da5c478612cd2ec4af221ea20f37c230884d2";
+      rev = "0550fea80e9c958a479067805bcf98e294bb2e32";
+      sha256 = "061fadcae3122f4d2bb86e0a238f8980884080427bbc3f0fe7e2e9c9efe6c5eb";
     };
     dependencies = [];
 
@@ -421,11 +434,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2015-09-14";
+    name = "vim-go-2015-10-03";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "73710fe6964c2f366682dba3550e2dcec7831949";
-      sha256 = "e4b83ec0233d1ae1cc4f7fe8dcc7e2dbd10de8fe314ff78045a850082f70b048";
+      rev = "1792ee374ba8d384cd547506cbf8f43690d1d55f";
+      sha256 = "cbcac7b9ee8fccf89fc7b5adfb9a7ca7cda2e15447093a9fc886c2fd5b0063e0";
     };
     dependencies = [];
 
@@ -443,11 +456,11 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2015-06-28";
+    name = "calendar-vim-2015-10-01";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "9cf5b7a01d439c5093bac92364d06e29ed15f2f0";
-      sha256 = "7e3f98b72270447b471aae0f178d2b06292d3449007b41350c6145436d1da114";
+      rev = "9aa130feab18fd142265487ce86f664746a080e0";
+      sha256 = "03b1ddec54f0b06be61dae2c42ac3cffd52833ecbcebd269f0e2a0d720aa9b83";
     };
     dependencies = [];
 
@@ -530,6 +543,28 @@ rec {
     postInstall = false;
   };
 
+  limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "limelight-vim-2015-08-19";
+    src = fetchgit {
+      url = "git://github.com/junegunn/limelight.vim";
+      rev = "153e3f7b78484eb4f5d69833ebf628f44b94996d";
+      sha256 = "85a5188dfd51a170b88e1df5ad4f5ae1cfb2e5c54dfbb734d7f4d85cf28eb5fd";
+    };
+    dependencies = [];
+
+  };
+
+  vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-peekaboo-2015-07-16";
+    src = fetchgit {
+      url = "git://github.com/junegunn/vim-peekaboo";
+      rev = "b14a7496897bb0a520bed4f519ca79a683bafeec";
+      sha256 = "926f42ee4271395ad8a3526e7b0f1077482cec2f557595d3365ac86eb88ae8c3";
+    };
+    dependencies = [];
+
+  };
+
   vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-eighties-2015-06-15";
     src = fetchgit {
@@ -563,6 +598,17 @@ rec {
 
   };
 
+  vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimtex-2015-10-04";
+    src = fetchgit {
+      url = "git://github.com/lervag/vimtex";
+      rev = "db92be5756239c31eed521f2131eac3ca997c0cc";
+      sha256 = "67597a04c0c92199d0499607982a202247ef879768445eb0c7a21d27357845fc";
+    };
+    dependencies = [];
+
+  };
+
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easymotion-2015-08-06";
     src = fetchgit {
@@ -589,6 +635,17 @@ rec {
     buildInputs = [ xkb_switch ];
   };
 
+  vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-startify-2015-08-20";
+    src = fetchgit {
+      url = "git://github.com/mhinz/vim-startify";
+      rev = "6f886cdc48cf34c50eb723abca2f813a5de2c11b";
+      sha256 = "2614bee6a0cdb1a80aa6d3cfeba9e7521ac0be21d15ca4512a413cf192d93fd8";
+    };
+    dependencies = [];
+
+  };
+
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lushtags-2015-06-06";
     src = fetchgit {
@@ -648,11 +705,11 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2015-09-15";
+    name = "neocomplete-vim-2015-10-03";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "f6befdc80f3e61d0d26734e064a84e5a78ee00cc";
-      sha256 = "c5307e5757deca8fe7ea17bf5ee60a89d855c42e2b0ebec5d40bc1dae09fffac";
+      rev = "d2a78075207b97c105041927a125e2cf0b2b0ca5";
+      sha256 = "6a64c6bd90a53f7f3636177cb1c507229d51b7dbb6a5dde8f3c4aad4cbe176d7";
     };
     dependencies = [];
 
@@ -670,33 +727,33 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-09-01";
+    name = "neosnippet-vim-2015-10-03";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "1617094a8c9df36d9a505f533b3a2efa44039412";
-      sha256 = "a061f5943b077219990288e369c6013a730117f2168f08f50d09b0d5032319a9";
+      rev = "7c07c4d8a2228c77ae4d519c936811db662ecd4a";
+      sha256 = "c967ad2b7a70bfa273e9a802b3b6603f85bcb5dcdae8749019ce43de7dfde85c";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2015-09-17";
+    name = "unite-vim-2015-10-02";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "f24df7733eca3009ee3fac159014aa2001ccadac";
-      sha256 = "06f7290cd1e8b1f65f6e6495ac6ac263feed101d804032fd595c0f1b1207ed16";
+      rev = "c57bed02229a80d050c2411dff5f0943e6edf08a";
+      sha256 = "3486c584a023b31257e3c67ad86557d62577aa9a5ee19b79736844f1a114179f";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2015-09-20";
+    name = "vimproc-vim-2015-10-03";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "d4939b5bed442e1c30fa9e7f05db0d110b2edce8";
-      sha256 = "6e80eae94b3e81951273a44677cfc03bfdeaaefab3ea13e76b1b79eaeb42b03e";
+      rev = "3134f1258de30a4eb7a3b1aeee90628a7f0c3a2a";
+      sha256 = "8993f0ac8d768f3e99fa05fca61434eeb5dc34b337db42b0524f60827be41b79";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -720,6 +777,17 @@ rec {
     dependencies = [ "vimproc-vim" ];
   };
 
+  gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gundo-vim-2013-07-10";
+    src = fetchgit {
+      url = "git://github.com/sjl/gundo.vim";
+      rev = "3975ac871565115e3769dc69c06bc88ddc1369af";
+      sha256 = "f66ed79d88171a4d57ee64eaf21035291518d8c64b607bd420c3ee85fa14afe5";
+    };
+    dependencies = [];
+
+  };
+
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hardtime-2014-10-21";
     src = fetchgit {
@@ -732,11 +800,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2015-08-09";
+    name = "vim-quickrun-2015-10-02";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "ec9f7f2c26dd49ffaf4f3ce8c6254c76696fbf41";
-      sha256 = "dc80ac9ee04329e770a549f83a6b167629daf29f513f31af0c076c237e978b5a";
+      rev = "9fff9e5f12fcea45637821e30e6dbee05e748854";
+      sha256 = "ca7376c6eafc1397c0a92c2ace7141daeeb881aaeabdc3168d4a0b598fd25caa";
     };
     dependencies = [];
 
@@ -753,6 +821,17 @@ rec {
 
   };
 
+  vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-eunuch-2015-06-30";
+    src = fetchgit {
+      url = "git://github.com/tpope/vim-eunuch";
+      rev = "eb8b2d54fb537ee93f762f6331265057a3f69727";
+      sha256 = "ec9194bf2ec97ae3c0f5818fb8a7a9edaf4ea93ca790df7c4d6a4e2486218fe6";
+    };
+    dependencies = [];
+
+  };
+
   hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hasksyn-2014-09-03";
     src = fetchgit {
@@ -776,11 +855,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-09-21";
+    name = "youcompleteme-2015-09-25";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "2816559ee465860a8a5502b7a1d551bdb46d1b24";
-      sha256 = "e7b258efd3fcd93dbfa9e326ace5c1ab01cbe868993e2817ab36eba605595a9d";
+      rev = "5a186275a581b04bbdb7001475d946e30d0f80b4";
+      sha256 = "6794aaa55ad55db1972260fe02099c8c05961c5ac9151776c88a2cdf3fcd92fd";
     };
     dependencies = [];
     buildInputs = [
@@ -821,6 +900,28 @@ rec {
     };
   };
 
+  vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pandoc-2015-08-13";
+    src = fetchgit {
+      url = "git://github.com/vim-pandoc/vim-pandoc";
+      rev = "ead1f177b2c894d60e01d3f16227e2e6e06c85a7";
+      sha256 = "44fa5d236f7ae2e98bd3e1575b79265be812b4a49488d001f9f37e9b2b8cd3f8";
+    };
+    dependencies = [];
+
+  };
+
+  vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pandoc-syntax-2015-09-25";
+    src = fetchgit {
+      url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
+      rev = "dd71d6fc53e22e2bc84790e0b60f9827957e1ea7";
+      sha256 = "60787f9ced453f335c0fe02f3e727bc9d4f4ab2e40a42a881b3b6f3b20798e37";
+    };
+    dependencies = [];
+
+  };
+
   Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Colour-Sampler-Pack-2012-11-29";
     src = fetchgit {
@@ -899,11 +1000,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-09-07";
+    name = "vim-wakatime-2015-10-01";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "39598ddbdbb973cf5e13f1e6e4aabf7664ba0096";
-      sha256 = "0efad3ccbfc3226a071ca3dadf46ae0813eccd4402efd8ad797e4194a5e91411";
+      rev = "9fd813c489958f98f5e8b215ab8b91b47f86fb5a";
+      sha256 = "d55ee76845eda96d1864f73d6927f8c20a2df21bd25dae03ede732d2610d9a32";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -1004,11 +1105,11 @@ rec {
   };
 
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2015-04-04";
+    name = "sensible-2015-09-24";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "d0beb8ab42627bea2c747564ca46ec663e3ba0ba";
-      sha256 = "c1893990e7b0b3f409b2ec4f4e1fb7f00f61a5146b94314ad28d86231d3ab6f7";
+      rev = "26f8783e08efef27fc01e0df6465b8f94c8bf270";
+      sha256 = "e04193a4f38bdc3c552ce5033bb3922a7ccae84ec6e1e46e12e71e1afb93cac3";
     };
     dependencies = [];
 
@@ -1134,17 +1235,6 @@ rec {
 
   };
 
-  vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-background-cmd-2015-01-05";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-background-cmd";
-      rev = "e99076519139b959edce0581b0f31207a5ec7c64";
-      sha256 = "524795221ae727635fe52ead47dff452d2dd48900917da609426ea399a2eceeb";
-    };
-    dependencies = ["vim-addon-mw-utils"];
-
-  };
-
   vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-commenting-2013-06-10";
     src = fetchgit {
@@ -1266,17 +1356,6 @@ rec {
 
   };
 
-  vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-signs-2013-04-19";
-    src = fetchgit {
-      url = "git://github.com/MarcWeber/vim-addon-signs";
-      rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
-      sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8";
-    };
-    dependencies = [];
-
-  };
-
   vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-sql-2014-01-18";
     src = fetchgit {
@@ -1322,11 +1401,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-07-08";
+    name = "vim-airline-2015-10-05";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "cdc6d98a09db60d3dda58815616f78338cbdaa9d";
-      sha256 = "bbbe04c92842d4110971396011f41ad1175b6c3b0f1d516c286cc7aca4c7052a";
+      rev = "543438e482763f64985a3fcab38a1936242a8087";
+      sha256 = "2e21b2658a941fd15b8db59220b50b3090a44e8852b42d0538d7217f12cbc77c";
     };
     dependencies = [];
 
@@ -1344,22 +1423,22 @@ rec {
   };
 
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2015-09-16";
+    name = "vim-easy-align-2015-10-01";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
-      rev = "98e0b493acae87202fba2294550957c9b5902b97";
-      sha256 = "23273a8928d23336982e194ba13e9501e3ccf684dff9ed17988e3e1f16117cf5";
+      rev = "0db4ea6132110631ec678a99a82aa49a0686ae65";
+      sha256 = "c70440c3d0afdda630422819ca66ccf483035af86903d8725be5ca43a0940937";
     };
     dependencies = [];
 
   };
 
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2015-06-04";
+    name = "vim-gista-2015-09-30";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
-      rev = "ffe85c0438cf5ad76b07ddb6524de3803c2bfdba";
-      sha256 = "9f44d07a4f36fb4559c99a655501b3752e180458de9d76d1cb293abd0f990fb4";
+      rev = "a6cc5edc4e6dfcf7f6d7cf4dbcfbca6082f78957";
+      sha256 = "68ecb6e1700e4e8f16c4096a8a554e3517e15d84bd1c07dbec4680c3947d1970";
     };
     dependencies = [];
 
@@ -1432,11 +1511,11 @@ rec {
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-09-14";
+    name = "vim-snippets-2015-10-05";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "93c4b32b4d7c7abd742518bcf92ab93ae4b43d54";
-      sha256 = "8ca82f43c4235838fcadc7c36e8b4feb65507311f0168081990d87432f0de14c";
+      rev = "eb17eb104bf39812658db504cb9bd13106a17dee";
+      sha256 = "8000dde268d95ddf504bbd54f4e03ec72cf8547b03966f0bdf46ca0becf1a684";
     };
     dependencies = [];
 
@@ -1486,4 +1565,25 @@ rec {
 
   };
 
+  vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-colorschemes-2015-07-25";
+    src = fetchgit {
+      url = "git://github.com/flazz/vim-colorschemes";
+      rev = "28a989b28457e38df620e4c7ab23e224aff70efe";
+      sha256 = "5308c874a34dc03256ece2e54ab7b92c8384ebb4137436582fd4aa6c38ad36e5";
+    };
+    dependencies = [];
+
+  };
+
+  vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-colorstepper-2015-08-04";
+    src = fetchgit {
+      url = "git://github.com/jonbri/vim-colorstepper";
+      rev = "5783c2567a193e7604780353d6f8ce445b2ab191";
+      sha256 = "a9ab0c724a827eba9c74d93dda118863656d27df7d5d26b971e0ac71c87f7e59";
+    };
+    dependencies = [];
+
+  };
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 092c11b405c8..7195064a20d3 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,8 +1,7 @@
-"vim-webdevicons"
 "CSApprox"
 "CheckAttach"
 "Gist"
-"Gundo"
+"github:sjl/gundo.vim"
 "Hoogle"
 "Solarized"
 "Supertab"
@@ -16,7 +15,6 @@
 "WebAPI"
 "YankRing"
 "commentary"
-"ctrlp"
 "ctrlp-py-matcher"
 "ctrlp-z"
 "extradite"
@@ -24,12 +22,15 @@
 "ghcmod"
 "github:JagaJaga/vim-addon-vim2nix"
 "github:ap/vim-css-color"
-"github:mkasa/lushtags"
+"github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
 "github:christoomey/vim-tmux-navigator"
+"github:ctrlpvim/ctrlp.vim"
+"github:digitaltoad/vim-jade"
 "github:eagletmt/neco-ghc"
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
+"github:flazz/vim-colorschemes"
 "github:idris-hackers/idris-vim"
 "github:itchyny/calendar.vim"
 "github:itchyny/thumbnail.vim"
@@ -38,12 +39,19 @@
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
 "github:jistr/vim-nerdtree-tabs"
+"github:jonbri/vim-colorstepper"
 "github:joonty/vim-xdebug"
+"github:junegunn/limelight.vim"
+"github:junegunn/vim-peekaboo"
 "github:justincampbell/vim-eighties"
 "github:latex-box-team/latex-box"
 "github:lepture/vim-jinja"
+"github:lervag/vimtex"
+"github:LnL7/vim-nix"
 "github:lokaltog/vim-easymotion"
 "github:lyokha/vim-xkbswitch"
+"github:mhinz/vim-startify"
+"github:mkasa/lushtags"
 "github:nbouscal/vim-stylish-haskell"
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
@@ -56,10 +64,13 @@
 "github:shougo/vimshell.vim"
 "github:takac/vim-hardtime"
 "github:thinca/vim-quickrun"
+"github:tpope/vim-eunuch"
 "github:tomasr/molokai"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
 "github:valloric/youcompleteme"
+"github:vim-pandoc/vim-pandoc"
+"github:vim-pandoc/vim-pandoc-syntax"
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
@@ -69,7 +80,6 @@
 "github:vim-scripts/wombat256.vim"
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
-"github:digitaltoad/vim-jade"
 "goyo"
 "matchit.zip"
 "pathogen"
@@ -110,6 +120,7 @@
 "vim-signature"
 "vim-signify"
 "vim-snippets"
+"vim-webdevicons"
 "vim2hs"
 "vimwiki"
 "vundle"