Merge remote-tracking branch 'channels/nixos-unstable'

11 files changed, 526 insertions, 93 deletions

diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix
index 11873e6f2a06..789aabce0435 100644
--- a/nixpkgs/pkgs/misc/cups/default.nix
+++ b/nixpkgs/pkgs/misc/cups/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
     homepage = https://cups.org/;
     description = "A standards-based printing system for UNIX";
     license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ matthewbauer ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/misc/drivers/utsushi/default.nix b/nixpkgs/pkgs/misc/drivers/utsushi/default.nix
new file mode 100644
index 000000000000..328e8ce45625
--- /dev/null
+++ b/nixpkgs/pkgs/misc/drivers/utsushi/default.nix
@@ -0,0 +1,154 @@
+{ stdenv, fetchurl, autoreconfHook, boost, gtkmm2
+, pkg-config, libtool, udev, libjpeg, file, texlive
+, libusb, libtiff, imagemagick, sane-backends, tesseract }:
+
+/*
+Alternatively, this package could use the "community source" at 
+https://gitlab.com/utsushi/utsushi/
+Epson provides proprietary plugins for networking, ocr and some more
+scanner models. Those are not (yet ?) packaged here.
+*/
+
+stdenv.mkDerivation rec {
+  pname = "utsushi";
+  version = "3.57.0";
+
+  src = fetchurl {
+    url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz";
+    sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    libtool
+  ];
+
+  buildInputs = [
+    boost
+    libusb
+    libtiff
+    libjpeg
+    udev
+    imagemagick
+    sane-backends
+    gtkmm2
+    file
+    tesseract
+  ];
+
+  patches = [
+    ./patches/absolute-path-to-convert.patch
+    ./patches/print-errors.patch
+    ./patches/absolute_path_for_tesseract.patch
+  ];
+
+  postPatch = ''
+    # remove vendored dependencies
+    rm -r upstream/boost
+    # create fake udev and sane config
+    mkdir -p $out/etc/{sane.d,udev/rules.d}
+    touch $out/etc/sane.d/dll.conf
+  '';
+
+  configureFlags = [
+    "--with-boost-libdir=${boost}/lib"
+    "--with-sane-confdir=${placeholder "out"}/etc/sane.d"
+    "--with-udev-confdir=${placeholder "out"}/etc/udev"
+    "--with-sane"
+    "--with-gtkmm"
+    "--with-jpeg"
+    "--with-magick"
+    "--with-sane"
+    "--with-tiff"
+  ];
+
+  installFlags = [ "SANE_BACKENDDIR=${placeholder "out"}/lib/sane" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "SANE utsushi backend for some Epson scanners";
+    longDescription = ''
+        ImageScanV3 (aka utsushi) scanner driver.
+        Non-free plugins are not included so no network support.
+        To use the SANE backend, in /etc/nixos/configuration.nix:
+
+        hardware.sane = {
+          enable = true;
+          extraBackends = [ pkgs.utsushi ];
+        };
+        services.udev.packages = [ pkgs.utsushi ];
+
+        Supported hardware: 
+        - DS-40
+        - DS-70
+        - DS-80W
+        - DS-410
+        - DS-510
+        - DS-520
+        - DS-530
+        - DS-535
+        - DS-535H
+        - DS-560
+        - DS-575W
+        - DS-760
+        - DS-775
+        - DS-780N
+        - DS-860
+        - DS-1630
+        - DS-5500
+        - DS-6500
+        - DS-7500
+        - DS-50000
+        - DS-60000
+        - DS-70000
+        - EP-10VA Series
+        - EP-808A Series
+        - EP-978A3 Series
+        - ES-50
+        - ES-55R
+        - ES-60W
+        - ES-65WR
+        - ES-300WR
+        - ES-400
+        - ES-500WR
+        - ES-8500
+        - ET-2500 Series
+        - ET-2550 Series
+        - ET-4500 Series
+        - ET-4550 Series
+        - Expression 1640XL
+        - FF-680W
+        - L220/L360 Series
+        - L365/L366 Series
+        - L380 Series
+        - L455 Series
+        - L565/L566 Series
+        - L655 Series
+        - PX-M840FX
+        - PX-M860F
+        - PX-M884F
+        - PX-M7050 Series
+        - PX-M7050FX Series
+        - WF-4720
+        - WF-6530 Series
+        - WF-6590 Series
+        - WF-8510/8590 Series
+        - WF-R8590 Series
+        - XP-220 Series
+        - XP-230 Series
+        - XP-235 Series
+        - XP-332 335 Series
+        - XP-430 Series
+        - XP-432 435 Series
+        - XP-530 Series
+        - XP-540
+        - XP-630 Series
+        - XP-640
+        - XP-830 Series
+        - XP-960 Series
+      '';
+      license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/nixpkgs/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch b/nixpkgs/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch
new file mode 100644
index 000000000000..2bc9422b061e
--- /dev/null
+++ b/nixpkgs/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch
@@ -0,0 +1,166 @@
+Index: utsushi-0.57.0/configure.ac
+===================================================================
+--- utsushi-0.57.0.orig/configure.ac
++++ utsushi-0.57.0/configure.ac
+@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag
+      [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])])
+   ])
+ AM_PROG_AR
++AC_PATH_PROG([AWK],[awk])
++AC_DEFINE_UNQUOTED([AWK], ["$AWK"],
++  [Path to awk.])
+ 
+ PKG_PROG_PKG_CONFIG
+ 
+@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes
+ AS_IF([test xno != "x$with_magick"],
+    AS_CASE("x$with_magick",
+      [xGraphicsMagick],
+-       [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
+-        AS_IF([test xgm != x$MAGICK_CONVERT],
++       [[AC_PATH_PROG(MAGICK_CONVERT, gm)]
++        AS_IF([test x == x$MAGICK_CONVERT],
+           [AC_MSG_ERROR([$with_magick requested but not found])])
+         AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
+-        MAGICK_CONVERT="gm convert"
++        HAVE_MAGICK=1
++        MAGICK_CONVERT="$MAGICK_CONVERT convert"
+        ],
+      [xImageMagick],
+-       [AC_CHECK_PROGS([MAGICK_CONVERT], [convert])
+-        AS_IF([test xconvert != x$MAGICK_CONVERT],
++       [[AC_PATH_PROG(MAGICK_CONVERT, convert)]
++        AS_IF([test x == x$MAGICK_CONVERT],
+           [AC_MSG_ERROR([$with_magick requested but not found])])
+         AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
++        HAVE_MAGICK=1
+        ],
+      [xyes|xcheck],
+-       [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert])
++       [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])]
+         AS_CASE(x$MAGICK_CONVERT,
+-          [xgm],
++          [x*gm],
+             [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
+-             MAGICK_CONVERT="gm convert"
++             HAVE_MAGICK=1
++             MAGICK_CONVERT="$MAGICK_CONVERT convert"
+             ],
+-          [xconvert],
++          [x*convert],
+             [AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
++            HAVE_MAGICK=1
+             ],
+           [dnl default case
+            AS_IF([test xcheck != "x$with_magick"],
+@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"],
+       AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
+      ]))
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+-AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
++AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
+ 
+ AS_IF([test xno != "x$with_gtkmm"],
+   [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
+Index: utsushi-0.57.0/filters/magick.cpp
+===================================================================
+--- utsushi-0.57.0.orig/filters/magick.cpp
++++ utsushi-0.57.0/filters/magick.cpp
+@@ -81,19 +81,18 @@ chomp (char *str)
+ }
+ 
+ bool
+-magick_version_before_(const char *magick, const char *cutoff)
++magick_version_before_(const char *cutoff)
+ {
+   FILE *fp = NULL;
+   int errc = 0;
+ 
+-  if (0 == strcmp ("GraphicsMagick", magick))
+-    fp = popen ("gm convert -version"
+-                "| awk '/^GraphicsMagick/{print $2}'", "r");
+-  if (fp) errc = errno;
+-
+-  if (0 == strcmp ("ImageMagick", magick))
+-    fp  = popen ("convert -version"
+-                 "| awk '/^Version:/{print $3}'", "r");
++#if HAVE_GRAPHICS_MAGICK
++  fp = popen (MAGICK_CONVERT " -version"
++                "| " AWK " '/^GraphicsMagick/{print $2}'", "r");
++#elif HAVE_IMAGE_MAGICK
++  fp  = popen (MAGICK_CONVERT " -version"
++                 "| " AWK " '/^Version:/{print $3}'", "r");
++#endif
+   if (fp) errc = errno;
+ 
+   if (fp)
+@@ -106,42 +105,32 @@ magick_version_before_(const char *magic
+ 
+       if (version)
+         {
+-          log::debug ("found %1%-%2%") % magick % version;
++          log::debug ("found " MAGICK_CONVERT "version %1%") % version;
+           return (0 > strverscmp (version, cutoff));
+         }
+     }
+ 
+   if (errc)
+-    log::alert ("failure checking %1% version: %2%")
+-      % magick
++    log::alert ("failure checking " MAGICK_CONVERT " version: %1%")
+       % strerror (errc);
+ 
+   return false;
+ }
+ 
+ bool
+-graphics_magick_version_before_(const char *cutoff)
+-{
+-  return magick_version_before_("GraphicsMagick", cutoff);
+-}
+-
+-bool
+-image_magick_version_before_(const char *cutoff)
+-{
+-  return magick_version_before_("ImageMagick", cutoff);
+-}
+-
+-bool
+ auto_orient_is_usable ()
+ {
+   static int usable = -1;
+ 
+   if (-1 == usable)
+     {
+-      if (HAVE_GRAPHICS_MAGICK)         // version -auto-orient was added
+-        usable = !graphics_magick_version_before_("1.3.18");
+-      if (HAVE_IMAGE_MAGICK)            // version known to work
+-        usable = !image_magick_version_before_("6.7.8-9");
++#if HAVE_GRAPHICS_MAGICK
++      // version -auto-orient was added
++      usable = !magick_version_before_("1.3.18");
++#elif HAVE_IMAGE_MAGICK
++      // version known to work
++      usable = !magick_version_before_("6.7.8-9");
++#endif
+       if (-1 == usable)
+         usable = false;
+       usable = (usable ? 1 : 0);
+@@ -392,7 +381,7 @@ magick::arguments (const context& ctx)
+   if (color_correction_)
+     {
+       if (HAVE_IMAGE_MAGICK
+-          && !image_magick_version_before_("6.6.1-0"))
++          && !magick_version_before_("6.6.1-0"))
+         argv += " -color-matrix";
+       else
+         argv += " -recolor";
+@@ -416,7 +405,7 @@ magick::arguments (const context& ctx)
+       size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5);
+ 
+       if (HAVE_IMAGE_MAGICK
+-          && !image_magick_version_before_("6.6.1-0"))
++          && !magick_version_before_("6.6.1-0"))
+         argv += " -color-matrix";
+       else
+         argv += " -recolor";
diff --git a/nixpkgs/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch b/nixpkgs/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch
new file mode 100644
index 000000000000..d4d444979210
--- /dev/null
+++ b/nixpkgs/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch
@@ -0,0 +1,56 @@
+Index: utsushi-0.57.0/filters/reorient.cpp
+===================================================================
+--- utsushi-0.57.0.orig/filters/reorient.cpp
++++ utsushi-0.57.0/filters/reorient.cpp
+@@ -96,8 +96,8 @@ chomp (char *str)
+ bool
+ tesseract_version_before_(const char *cutoff)
+ {
+-  FILE *fp = popen ("tesseract --version 2>&1"
+-                    "| awk '/^tesseract/{ print $2 }'", "r");
++  FILE *fp = popen (TESSERACT " --version 2>&1"
++                    "| " AWK " '/^tesseract/{ print $2 }'", "r");
+   int errc = errno;
+ 
+   if (fp)
+@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu
+ bool
+ have_tesseract_language_pack_(const char *lang)
+ {
+-  std::string cmd("tesseract --list-langs 2>&1"
++  std::string cmd(TESSERACT " --list-langs 2>&1"
+                   "| sed -n '/^");
+   cmd += lang;
+   cmd += "$/p'";
+@@ -291,7 +291,7 @@ reorient::reorient ()
+ 
+   if (found)
+     {
+-      if (have_tesseract_())  engine_ = "tesseract";
++      if (have_tesseract_())  engine_ = TESSERACT;
+       if (have_ocr_engine_()) engine_ = abs_path_name;
+     }
+   freeze_options ();   // initializes option tracking member variables
+Index: utsushi-0.57.0/configure.ac
+===================================================================
+--- utsushi-0.57.0.orig/configure.ac
++++ utsushi-0.57.0/configure.ac
+@@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP],
+   [0], [Define to 1 if ImageMagick's C++ API is usable])
+ AC_DEFINE([MAGICK_CONVERT],
+   [], [Define to an appropriate command-line invocation for convert])
++AC_DEFINE([TESSERACT],
++  [], [Define to an appropriate command-line invocation for tesseract])
+ AC_DEFINE([WITH_INCLUDED_BOOST],
+   [0], [Define to 1 if using the included Boost sources])
+ 
+@@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"],
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+ AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
+ 
++AC_PATH_PROG([TESSERACT], [tesseract], [tesseract])
++AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"])
++
+ AS_IF([test xno != "x$with_gtkmm"],
+   [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
+      [AC_DEFINE([HAVE_LIBGTKMM], [1])],
diff --git a/nixpkgs/pkgs/misc/drivers/utsushi/patches/print-errors.patch b/nixpkgs/pkgs/misc/drivers/utsushi/patches/print-errors.patch
new file mode 100644
index 000000000000..06660ebde988
--- /dev/null
+++ b/nixpkgs/pkgs/misc/drivers/utsushi/patches/print-errors.patch
@@ -0,0 +1,15 @@
+Index: utsushi-0.57.0/lib/log.cpp
+===================================================================
+--- utsushi-0.57.0.orig/lib/log.cpp
++++ utsushi-0.57.0/lib/log.cpp
+@@ -26,8 +26,8 @@
+ 
+ namespace utsushi {
+ 
+-log::priority log::threshold = log::FATAL;
+-log::category log::matching  = log::NOTHING;
++log::priority log::threshold = log::ERROR;
++log::category log::matching  = log::ALL;
+ 
+ template<>
+ std::basic_ostream< char >&
diff --git a/nixpkgs/pkgs/misc/drivers/utsushi/patches/series b/nixpkgs/pkgs/misc/drivers/utsushi/patches/series
new file mode 100644
index 000000000000..de0964c758b1
--- /dev/null
+++ b/nixpkgs/pkgs/misc/drivers/utsushi/patches/series
@@ -0,0 +1,3 @@
+absolute-path-to-convert.patch
+print-errors.patch
+absolute_path_for_tesseract.patch
diff --git a/nixpkgs/pkgs/misc/themes/kde2/default.nix b/nixpkgs/pkgs/misc/themes/kde2/default.nix
index 91584bfa1fe3..8adf6a1e4330 100644
--- a/nixpkgs/pkgs/misc/themes/kde2/default.nix
+++ b/nixpkgs/pkgs/misc/themes/kde2/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, mkDerivation
 , cmake, extra-cmake-modules
 , qtbase, kcoreaddons, kdecoration }:
 
 let
   version = "2017-03-15";
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "kde2-decoration-${version}";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/misc/themes/qtcurve/default.nix b/nixpkgs/pkgs/misc/themes/qtcurve/default.nix
index 54715c01a9ee..348b4ae4eb94 100644
--- a/nixpkgs/pkgs/misc/themes/qtcurve/default.nix
+++ b/nixpkgs/pkgs/misc/themes/qtcurve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation
 , gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
 , karchive, kconfig, kconfigwidgets, kio, frameworkintegration
 , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
@@ -7,7 +7,7 @@
 
 let
   version = "1.9";
-in stdenv.mkDerivation {
+in mkDerivation {
   name = "qtcurve-${version}";
   src = fetchurl {
     url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 5b1032fb0312..b8e9dd2d9609 100644
--- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-08-02";
+    version = "2019-08-12";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857";
-      sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj";
+      rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4";
+      sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq";
     };
   };
 
@@ -391,12 +391,12 @@ let
 
   coc-lists = buildVimPluginFrom2Nix {
     pname = "coc-lists";
-    version = "2019-08-01";
+    version = "2019-08-12";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-lists";
-      rev = "999865c6bd3745689d1eb4009b9b706cb5a68617";
-      sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy";
+      rev = "2c502ceec9816259350969970e76402c984ac4f9";
+      sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9";
     };
   };
 
@@ -764,6 +764,17 @@ let
     };
   };
 
+  delimitMate = buildVimPluginFrom2Nix {
+    pname = "delimitMate";
+    version = "2017-06-19";
+    src = fetchFromGitHub {
+      owner = "Raimondi";
+      repo = "delimitMate";
+      rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c";
+      sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn";
+    };
+  };
+
   denite-extra = buildVimPluginFrom2Nix {
     pname = "denite-extra";
     version = "2019-03-29";
@@ -788,12 +799,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-08-04";
+    version = "2019-08-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "fb56c2ca2ff655c4d82e000e13e233629894caac";
-      sha256 = "1bwcm7smvfpllbkxb512ys9gjc5gin7v75jkys7q0xq0xb73d1hn";
+      rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0";
+      sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n";
     };
   };
 
@@ -901,12 +912,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-08-11";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "153e242b07cfe5d67cd217eda3163730046de88b";
-      sha256 = "08slqd2kcy94xs669y8rbyz8xz72zn4rasa0yyk3i7yp8w4awgp8";
+      rev = "bb2b16309b94695a3344c713282368b3329a2412";
+      sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9";
     };
   };
 
@@ -1013,12 +1024,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2019-08-01";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73";
-      sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn";
+      rev = "d642592f062c5e4d195e627ac4104d4e0355a125";
+      sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac";
     };
   };
 
@@ -1046,12 +1057,12 @@ let
 
   ferret = buildVimPluginFrom2Nix {
     pname = "ferret";
-    version = "2019-06-12";
+    version = "2019-08-13";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "f6d7d01de8a92baee83218001c0bdbade8458a72";
-      sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr";
+      rev = "aeb47b01b36021aaf84ff4f7f1a4cf64bc68fe53";
+      sha256 = "1cssvdpkmrlby50p2lyqfz1jhp5igyv1bqd34588p3ivsd3hrhyy";
     };
   };
 
@@ -1355,12 +1366,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2019-07-13";
+    version = "2019-08-11";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "b9f83175951654256cff41737841b4abc0c9266d";
-      sha256 = "0w24zqs1026khdzr7v283yx9yc3sp5rw4kzsjwalclg5xnyy55c0";
+      rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827";
+      sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86";
       fetchSubmodules = true;
     };
   };
@@ -1477,12 +1488,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2019-08-06";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "f5039419d87b76accee7000319b394ce25a0dbfb";
-      sha256 = "0cfjw1jpddw92jz62ly8m6waxknj19cazff01x8drk1lr9xj6wdy";
+      rev = "09c61dc3f650eccd2c165c36db8330496321aa50";
+      sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb";
     };
   };
 
@@ -1697,12 +1708,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2019-08-10";
+    version = "2019-08-15";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "ebfb1f5a24f39561b0299ffe4d346582a6e2432d";
-      sha256 = "0yjd3h36zd5g4m0ldijx0p75hlf2dq69y38ilwpm2zp8rqhqgmaw";
+      rev = "cad94240c8284ab3502c62acc18e420ca22107de";
+      sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq";
     };
   };
 
@@ -1895,12 +1906,12 @@ let
 
   onehalf = buildVimPluginFrom2Nix {
     pname = "onehalf";
-    version = "2019-06-26";
+    version = "2019-08-17";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
-      rev = "408104a30ae4f220096e591350a72e60cc15f9b3";
-      sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2";
+      rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e";
+      sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql";
     };
   };
 
@@ -2137,12 +2148,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2019-08-01";
+    version = "2019-08-15";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50";
-      sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf";
+      rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff";
+      sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x";
     };
   };
 
@@ -2168,6 +2179,17 @@ let
     };
   };
 
+  seoul256-vim = buildVimPluginFrom2Nix {
+    pname = "seoul256-vim";
+    version = "2017-09-05";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "seoul256.vim";
+      rev = "1475b7610663c68aa90b6e565997c8792ce0d222";
+      sha256 = "03gqw14f5cirivcg1p06g500ns066yv5rd0z3zikvn4ql7n278dk";
+    };
+  };
+
   shabadou-vim = buildVimPluginFrom2Nix {
     pname = "shabadou-vim";
     version = "2016-07-19";
@@ -2203,12 +2225,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2019-06-26";
+    version = "2019-08-12";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8";
-      sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c";
+      rev = "9f7bee325f32db1ee509b82e5144df522fa2aca2";
+      sha256 = "1i9kyipnd7fkv7vdlwpsb44h0yzvf0rjrwrj09w8bj2lqmcv8yjp";
     };
   };
 
@@ -2852,12 +2874,12 @@ let
 
   vim-bazel = buildVimPluginFrom2Nix {
     pname = "vim-bazel";
-    version = "2019-01-30";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "bazelbuild";
       repo = "vim-bazel";
-      rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939";
-      sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f";
+      rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8";
+      sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg";
     };
   };
 
@@ -2940,12 +2962,12 @@ let
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2019-06-16";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "0de948ca411c65ee1d07be84ee406e38f7a725d8";
-      sha256 = "1cyvj1q94frnii1mcx1f1dhl5z38ppmly6wjgz71hs1w5qdy12qh";
+      rev = "18f47c3ac563b60f71103b1e1d29b349ff9d8549";
+      sha256 = "0z36jjj1bxb4xz9lyjrbv769797g3x475ncamflfj6yj72vvhfy4";
     };
   };
 
@@ -3015,6 +3037,17 @@ let
     };
   };
 
+  vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix {
+    pname = "vim-cpp-enhanced-highlight";
+    version = "2019-07-01";
+    src = fetchFromGitHub {
+      owner = "octol";
+      repo = "vim-cpp-enhanced-highlight";
+      rev = "da1d86aaf42bd4e52272b5a2f62b098c3986c048";
+      sha256 = "02cz8av85pjxpl9ggiy0y0z3gnjvd6ng1pafzv0c64xharg9l5aq";
+    };
+  };
+
   vim-csharp = buildVimPluginFrom2Nix {
     pname = "vim-csharp";
     version = "2017-03-29";
@@ -3171,12 +3204,12 @@ let
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2019-07-22";
+    version = "2019-08-15";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "46a68476fc7b4f454c829d83d21997b82ac66f76";
-      sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs";
+      rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5";
+      sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm";
     };
   };
 
@@ -3215,12 +3248,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2019-08-09";
+    version = "2019-08-12";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "c4f084bc36bbb7b2ab4216d87f1cce644d278dc7";
-      sha256 = "1c3vfpq7d3fibjz748sracfbxg6xp28c2y5780cc1jkph5z7wvvj";
+      rev = "8712a165da4d1de9fb6ae918322ece843ac742e0";
+      sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7";
     };
   };
 
@@ -3281,12 +3314,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-08-11";
+    version = "2019-08-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "4daa0c558ceb14223c6c6861063ef0ae9a35233b";
-      sha256 = "13m30hl6syha9pkr58w23sch89m2nd9cgxbdnkkcqvbzlq202nfh";
+      rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5";
+      sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh";
     };
   };
 
@@ -3325,12 +3358,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-08-10";
+    version = "2019-08-16";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "9bf988bd1d2d8001f84126d8bf74036bab33bb9b";
-      sha256 = "0ksz7k29nzs00apnimp2r3hqjamdhcpr9h241hcagil3dqraqi5d";
+      rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89";
+      sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw";
     };
   };
 
@@ -3358,12 +3391,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-08-09";
+    version = "2019-08-12";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "ed63c87496c030d436507c4eb211a923aa5dc90b";
-      sha256 = "0vxqx343wgc9dr9s7jx33hai7ib8cqlfqfpwbmv7zq83x5ff0sh6";
+      rev = "007b69c27b63fbcbe2e0766073b09281274b0231";
+      sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w";
     };
   };
 
@@ -3611,12 +3644,12 @@ let
 
   vim-javascript = buildVimPluginFrom2Nix {
     pname = "vim-javascript";
-    version = "2019-07-08";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "pangloss";
       repo = "vim-javascript";
-      rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a";
-      sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s";
+      rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5";
+      sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f";
     };
   };
 
@@ -3810,23 +3843,23 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2019-08-10";
+    version = "2019-08-13";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "329d894f941945287e9797c42e6125838c8a2ac0";
-      sha256 = "1cv1mgdc4i68kvbh1z090vj29yl2axqfnnlizikbf1z68s2ghnvr";
+      rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a";
+      sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25";
     };
   };
 
   vim-maktaba = buildVimPluginFrom2Nix {
     pname = "vim-maktaba";
-    version = "2019-01-24";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
-      rev = "ec7a094e602babc2e0d43dc5fa5411e46e3bd70c";
-      sha256 = "1377wqzrsvwvmzb91a6fm5ma2hnnlas0wgia5bk62a8f1rsgyfgc";
+      rev = "ed4357d2caf1d04bd229a24191098759f94b2e25";
+      sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v";
     };
   };
 
@@ -4074,12 +4107,12 @@ let
 
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
-    version = "2019-07-16";
+    version = "2019-08-17";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962";
-      sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3";
+      rev = "307b0f244d99408decda3a98f58e864d49626818";
+      sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw";
     };
   };
 
@@ -4294,12 +4327,12 @@ let
 
   vim-signify = buildVimPluginFrom2Nix {
     pname = "vim-signify";
-    version = "2019-08-09";
+    version = "2019-08-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "2673d732dd329b012b1f319de8ba289dbf5a281e";
-      sha256 = "0qmf32yi6kk8y020qgi2g7xw3c7kxh0i58r5y3mfwya9f4lqm43r";
+      rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad";
+      sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc";
     };
   };
 
@@ -4415,12 +4448,12 @@ let
 
   vim-startify = buildVimPluginFrom2Nix {
     pname = "vim-startify";
-    version = "2019-08-07";
+    version = "2019-08-15";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "2486ab67bc5a84414ec8792f5ce7aaf04a91138c";
-      sha256 = "1wpk9xflhj2cklfk9ac6dpp436gizl6la8877d8ra19774zgw0k1";
+      rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33";
+      sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr";
     };
   };
 
@@ -4514,12 +4547,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2019-07-12";
+    version = "2019-08-16";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "6781cc1dbfec16efc7a67bf8f8c118898664da11";
-      sha256 = "0iqbb5ycl33q0542gj7kr3dyalvha59y0dyyzymzs5lqa1q0y7in";
+      rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b";
+      sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9";
     };
   };
 
@@ -4822,12 +4855,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-08-09";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "d01f136c068451ef99795ceb15d285d362bec61b";
-      sha256 = "06hqzw63mijiqadczaf2x3sy117hlzil16la1w6ynf6d37hr1zq1";
+      rev = "866699bdae3696130159e7115954c64de8e7bdcd";
+      sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq";
     };
   };
 
@@ -4866,12 +4899,12 @@ let
 
   vundle = buildVimPluginFrom2Nix {
     pname = "vundle";
-    version = "2018-02-03";
+    version = "2019-08-17";
     src = fetchFromGitHub {
       owner = "gmarik";
       repo = "vundle";
-      rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
-      sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
+      rev = "b255382d6242d7ea3877bf059d2934125e0c4d95";
+      sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6";
     };
   };
 
@@ -5022,12 +5055,12 @@ let
 
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
-    version = "2019-08-03";
+    version = "2019-08-14";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "5ef469df4f663a81e983f5ee4dce9b50b8a612af";
-      sha256 = "0bmcc051n9jhzggsi1mwcmlsg5qhhzycvsrziladl7xg22nv8w5m";
+      rev = "defc660d235152e82271a48bd89bfcc9fa58b432";
+      sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q";
     };
   };
 
diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index 65c0d02bdfc2..59b450820c18 100644
--- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -137,6 +137,7 @@ JuliaEditorSupport/julia-vim
 junegunn/fzf.vim
 junegunn/goyo.vim
 junegunn/limelight.vim
+junegunn/seoul256.vim
 junegunn/vim-easy-align
 junegunn/vim-github-dashboard
 junegunn/vim-peekaboo
@@ -282,6 +283,7 @@ noc7c9/vim-iced-coffee-script
 ntpeters/vim-better-whitespace
 numirias/semshi
 nvie/vim-flake8
+octol/vim-cpp-enhanced-highlight
 OrangeT/vim-csharp
 osyo-manga/shabadou.vim
 osyo-manga/vim-anzu
@@ -306,6 +308,7 @@ rafaqz/ranger.vim
 rafi/awesome-vim-colorschemes
 raghur/vim-ghost
 raichoo/purescript-vim
+Raimondi/delimitMate
 rakr/vim-one
 reedes/vim-pencil
 reedes/vim-wordy
diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix
index 2633c43d6992..44bc7ec3ced1 100644
--- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix
@@ -188,7 +188,8 @@ let
     vam ? null,
     pathogen ? null,
     plug ? null,
-    customRC ? ""
+    customRC ? "",
+    beforePlugins ? "",
   }:
 
     let
@@ -341,6 +342,8 @@ let
   " minimal setup, generated by NIX
   set nocompatible
 
+  ${beforePlugins}
+
   ${vamImpl}
   ${pathogenImpl}
   ${plugImpl}