diff options
Diffstat (limited to 'nixpkgs/pkgs/misc')
25 files changed, 523 insertions, 270 deletions
diff --git a/nixpkgs/pkgs/misc/acpilight/default.nix b/nixpkgs/pkgs/misc/acpilight/default.nix index 20efe6342859..e36e41885008 100644 --- a/nixpkgs/pkgs/misc/acpilight/default.nix +++ b/nixpkgs/pkgs/misc/acpilight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python36, udev, coreutils }: +{ stdenv, fetchgit, python3, udev, coreutils }: stdenv.mkDerivation rec { pname = "acpilight"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd"; }; - pyenv = python36.withPackages (pythonPackages: with pythonPackages; [ + pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ ConfigArgParse ]); diff --git a/nixpkgs/pkgs/misc/apulse/default.nix b/nixpkgs/pkgs/misc/apulse/default.nix index 58e50a50f0f9..273e358184d3 100644 --- a/nixpkgs/pkgs/misc/apulse/default.nix +++ b/nixpkgs/pkgs/misc/apulse/default.nix @@ -4,13 +4,13 @@ let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { - name = "apulse-${version}"; - version = "0.1.11.1"; + pname = "apulse"; + version = "0.1.12"; src = fetchFromGitHub { owner = "i-rinat"; - repo = "apulse"; - rev = "602b3a02b4b459d4652a3a0a836fab6f892d4080"; + repo = pname; + rev = "v${version}"; sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio emulation for ALSA"; - homepage = https://github.com/i-rinat/apulse; + homepage = "https://github.com/i-rinat/apulse"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix new file mode 100644 index 000000000000..872e49dc3c7a --- /dev/null +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -0,0 +1,116 @@ +{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript, perl }: + +let + + arch = if stdenv.system == "x86_64-linux" + then "x86_64" + else "i386"; + +in stdenv.mkDerivation rec { + name = "samsung-unified-linux-driver-${version}"; + version = "1.00.36"; + + src = fetchurl { + sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + }; + + buildInputs = [ + cups + libusb + libxml2 + perl + ]; + + installPhase = '' + + mkdir -p $out/bin + cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin + + mkdir -p $out/etc/sane.d/dll.d/ + install -m644 noarch/etc/smfp.conf $out/etc/sane.d + echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf + + mkdir -p $out/etc/smfp-common/scanner/share/ + install -m644 noarch/libsane-smfp.cfg $out/etc/smfp-common/scanner/share/ + install -m644 noarch/pagesize.xml $out/etc/smfp-common/scanner/share/ + + mkdir -p $out/etc/samsung/scanner/share/ + install -m644 noarch/oem.conf $out/etc/samsung/scanner/share/ + + mkdir -p $out/lib + install -m755 ${arch}/libscmssc.so* $out/lib + + mkdir -p $out/lib/cups/backend + ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend + + mkdir -p $out/lib/cups/filter + ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $ghostscript/bin/gs $out/lib/cups/filter + + mkdir -p $out/lib/sane + install -m755 ${arch}/libsane-smfp.so* $out/lib/sane + ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1 + ln -s libsane-smfp.so.1 $out/lib/sane/libsane-smfp.so + + perl -pi -e \ + 's|/opt/smfp-common/scanner/.usedby/|/tmp/\0\0fp-common/scanner/.usedby/|g' \ + $out/lib/sane/libsane-smfp.so.1.0.1 + perl -pi -e 's|/opt|/etc|g' \ + $out/lib/sane/libsane-smfp.so.1.0.1 \ + $out/bin/rastertospl \ + noarch/package_utils \ + noarch/pre_install.sh + + mkdir -p $out/lib/udev/rules.d + ( + OEM_FILE=noarch/oem.conf + INSTALL_LOG_FILE=/dev/null + . noarch/scripting_utils + . noarch/package_utils + . noarch/scanner-script.pkg + fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules + chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules + ) + + mkdir -p $out/share + cp -R noarch/share/* $out/share + gzip -9 $out/share/ppd/*.ppd + rm -r $out/share/locale/*/*/install.mo + + mkdir -p $out/share/cups + cd $out/share/cups + ln -s ../ppd . + ln -s ppd model + ''; + + preFixup = '' + for bin in "$out/bin/"*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + done + + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "Unified Linux Driver for Samsung printers and scanners"; + homepage = http://www.bchemnet.com/suldr; + downloadPage = http://www.bchemnet.com/suldr/driver/; + license = licenses.unfree; + + # Tested on linux-x86_64. Might work on linux-i386. + # Probably won't work on anything else. + platforms = platforms.linux; + maintainers = with maintainers; [ tohl ]; + }; +} diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix new file mode 100644 index 000000000000..e98da9de2b60 --- /dev/null +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix @@ -0,0 +1,44 @@ +# the original samsung-unified-linux-driver_1_00_36 has some paths +# hardcoded in binary files +# +# nixos samsung-unified-linux-driver_1_00_36 tries to fix those paths +# by patching the binaries +# +# this module is needed to put the expected files in the new paths +# +# printing works without problems +# +# scanning works, except one detail: sometimes it is possible to scan +# more pages in sequence. most of the time though, scanning stops +# working after one page. this problem happens both with scanimage +# and simple-scan. errors indicate an I/O error. scanning works +# again after turning the device off and on. atm i have no idea how +# to fix this and no time to do more about it. +{config, pkgs, lib ? pkgs.lib, ...}: +with lib; +let + cfg = config.services.samsung-unified-linux-driver_1_00_36; + pkg = pkgs.samsung-unified-linux-driver_1_00_36; +in { + options = { + services.samsung-unified-linux-driver_1_00_36 = { + enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36"; + }; + }; + config = mkIf cfg.enable { + services.printing.drivers = [pkg]; + hardware.sane.extraBackends = [pkg]; + environment.etc = { + "samsung/scanner/share/oem.conf".source + = "${pkg}/etc/samsung/scanner/share/oem.conf"; + "smfp-common/scanner/share/libsane-smfp.cfg".source + = "${pkg}/etc/smfp-common/scanner/share/libsane-smfp.cfg"; + "smfp-common/scanner/share/pagesize.xml".source + = "${pkg}/etc/smfp-common/scanner/share/pagesize.xml"; + "sane.d/smfp.conf".source + = "${pkg}/etc/sane.d/smfp.conf"; + "sane.d/dll.d/smfp-scanner.conf".source + = "${pkg}/etc/sane.d/dll.d/smfp-scanner.conf"; + }; + }; +} diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix index 34761df5ea14..d063ec912b97 100644 --- a/nixpkgs/pkgs/misc/cups/filters.nix +++ b/nixpkgs/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "08szgpmac7xlf6vqkvg3pbphnrk2mal3gy382q2y3cm7k4plys3y"; + sha256 = "06gy3wv6p7kswz3mjn17f17mqpadvqj2riwc42kksnvp8x0h08cw"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 789cb6fc4de0..ea9554288091 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -77,6 +77,7 @@ pythonPackages.buildPythonApplication { sip ] ++ stdenv.lib.optionals withQt5 [ pyqt5 + enum-compat ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; diff --git a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index bd2be99a2843..77d9f5094d05 100644 --- a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -3,19 +3,19 @@ }: let - version = "1.1.0"; - rev = "a12239148332ca7a0b1c44a93e1585452d3631c9"; + version = "1.1.1"; + rev = "af12e2e4da586275ba931eae8f40a2201251bf59"; baseUrl = "https://emux.cc/versions/${stdenv.lib.substring 0 8 rev}/CCEmuX"; jar = if useCCTweaked then fetchurl { url = "${baseUrl}-cct.jar"; - sha256 = "1i767v3wnb8jsh7ciqqvw548pka1b8vl18k1rdv5dn21la6n0r1d"; + sha256 = "0d9gzi1h5vz32fp4lfn7dam189jcm7bwbqwmlpj0c47p8l0d4lsv"; } else fetchurl { url = "${baseUrl}-cc.jar"; - sha256 = "0x9hs814ln193cwybd565mcj6vhnii4wirkiz9na7vcas0y5vmmq"; + sha256 = "0ky5vxh8m1v98zllifxif8xxd25j2xdp19hjnj4xlkck71lbnb34"; }; desktopIcon = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix index 87893a931363..a57fda56ddd4 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,15 +1,20 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "image-analyzer"; - pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; + pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ]; + buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool + python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/image-analyzer \ + --set PYTHONPATH "$PYTHONPATH" \ + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; }; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/client.nix b/nixpkgs/pkgs/misc/emulators/cdemu/client.nix index ec4341a29459..dbf471d35d1d 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/client.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/client.nix @@ -1,11 +1,11 @@ -{ callPackage, pythonPackages, intltool, makeWrapper }: +{ callPackage, python3Packages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "cdemu-client"; - pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; + pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5"; }; in callPackage pkg { - buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 + buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 intltool makeWrapper ]; drvParams = { postFixup = '' diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix b/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix index 587224e71d78..a80327ce91c0 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libao, intltool }: +{ callPackage, glib, libao, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "cdemu-daemon"; - pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; + pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b"; }; in callPackage pkg { - buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; + buildInputs = [ glib libao libmirage intltool ]; } diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix index 14560919b71a..331ad0ded248 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix @@ -1,15 +1,17 @@ -{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "gcdemu"; - pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; + pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g"; }; - inherit (pythonPackages) python pygobject3; + inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/gcdemu \ --set PYTHONPATH "$PYTHONPATH" \ diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix b/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix index 3813ceef6115..0ead78305cd0 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,9 +1,18 @@ -{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }: +{ callPackage, gobject-introspection, cmake, pkgconfig +, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool +, pcre, utillinux, libselinux, libsepol }: + let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "libmirage"; - pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; + pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; + drvParams = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; + propagatedBuildInputs = [ pcre utillinux libselinux libsepol ]; + }; } diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix index 73ef7bc6a180..2ce3f606d733 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vhba-${version}"; - version = "20170610"; + version = "20190302"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"; + sha256 = "0wvxxc064i8czza91gh0dhmh55x2nbs7szzyh4g30w0c98hmc1n5"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/nixpkgs/pkgs/misc/emulators/hatari/default.nix b/nixpkgs/pkgs/misc/emulators/hatari/default.nix index 287df4db01be..3cb0f787ce76 100644 --- a/nixpkgs/pkgs/misc/emulators/hatari/default.nix +++ b/nixpkgs/pkgs/misc/emulators/hatari/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, SDL, cmake }: stdenv.mkDerivation rec { - name = "hatari-2.1.0"; + name = "hatari-2.2.1"; src = fetchurl { - url = "https://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2"; - sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb"; + url = "https://download.tuxfamily.org/hatari/2.2.1/${name}.tar.bz2"; + sha256 = "0q3g23vnx58w666723v76ilh9j353md3sn48cmlq9gkll8qfzbqi"; }; # For pthread_cancel diff --git a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index a3177b07f08b..32201c48ee98 100644 --- a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdsk-${version}"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; - sha256 = "1r0y07qd3zixi53vql5yqakvv77qm86s6qjwypk9ckggrp5r3w60"; + sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index 59f0252259cc..66e17fd3a7a3 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { name = "visualboyadvance-m-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz"; + sha256 = "03cs7wn01flx925sxhpz1j5sxa6s7wfxq71955kasn7a3xr1kxwn"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/ghostscript/default.nix b/nixpkgs/pkgs/misc/ghostscript/default.nix index 10481c217851..a12d7d7d5acd 100644 --- a/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2 +, libiconv, ijs, lcms2, fetchpatch , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff + (fetchpatch { + name = "CVE-2019-6116"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; + sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; + }) ]; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/misc/scrcpy/default.nix b/nixpkgs/pkgs/misc/scrcpy/default.nix index 87762eb4b258..20ba1295c422 100644 --- a/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -9,33 +9,30 @@ }: let - version = "1.5"; + version = "1.8"; prebuilt_server = fetchurl { - url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar"; - sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr"; + url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; + sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443"; }; in stdenv.mkDerivation rec { - name = "scrcpy-${version}"; + pname = "scrcpy"; inherit version; + src = fetchFromGitHub { owner = "Genymobile"; - repo = "scrcpy"; - rev = "v${version}-fixversion"; - sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i"; + repo = pname; + rev = "v${version}"; + sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7"; }; # postPatch: # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. # It would be better to fix the OpenGL problem, but that seems much more intrusive. - # - # command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally. postPatch = '' substituteInPlace app/src/screen.c \ --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" - substituteInPlace app/src/command.c \ - --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};' ''; nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ]; diff --git a/nixpkgs/pkgs/misc/themes/solarc/default.nix b/nixpkgs/pkgs/misc/themes/solarc/default.nix new file mode 100644 index 000000000000..55cd6e1dac04 --- /dev/null +++ b/nixpkgs/pkgs/misc/themes/solarc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, + gtk-engine-murrine, gtk3 +}: + +stdenv.mkDerivation rec { + name = "solarc-gtk-theme-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "schemar"; + repo = "solarc-theme"; + rev = "d1eb117325b8e5085ecaf78df2eb2413423fc643"; + sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; + + buildPhase = '' + ./autogen.sh --prefix=$out + ''; + + meta = with stdenv.lib; { + description = "Solarized version of the Arc theme"; + homepage = https://github.com/schemar/solarc-theme; + license = licenses.gpl3; + maintainers = [ maintainers.bricewge ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 2e269e185e4d..8d1a8e64b61f 100644 --- a/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -228,6 +228,15 @@ in rec { dependencies = [ pkgs.urlview ]; }; + vim-tmux-navigator = mkDerivation { + pluginName = "vim-tmux-navigator"; + src = fetchgit { + url = "https://github.com/christoomey/vim-tmux-navigator"; + rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; + sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; + }; + }; + yank = mkDerivation { pluginName = "yank"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index e1746b675832..d66a79e4df91 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-03-13"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "80ef7ea2d0b22f0d8de7387a3d5bf6e9e5b72e9d"; - sha256 = "1i767mxfgwn804hwr088n9n9xmj49bwrvb8nv8qjxynqzp3hxsfb"; + rev = "cdf89f8269aec31d0dfddf3a2769027d72d38155"; + sha256 = "13zj7sahhan1w50jkncina979cyk3kca5ly68571bzccyzm8dazi"; }; }; @@ -127,12 +127,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-02-16"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "88d883cc89b2d13b3bae60aa294cef57067e17e2"; - sha256 = "0f6xa50r9fv9qhw8slfqq0g0p8y2zc08bpg09f2g0lp69gidi7rg"; + rev = "dec452fcf71c8d09c4029fe28d9ac12af935f6ac"; + sha256 = "1gsh0dibbwz7vypvc23h230x56n7i8a5y6c872lqflf2as62x0xr"; }; }; @@ -248,12 +248,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2018-09-19"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "7364a410bc4f0d7febc183678cd565066dfd1e73"; - sha256 = "1a14ddq6jkfklicdgkpbizzlrx2r4isxarbav5q86w86rwkx3jfi"; + rev = "792d6079d32f1973c142c6fab89d2fdc94019ac8"; + sha256 = "0bi2bmx0k6fwi1jwajgafbb750ajlzz1jncvvg0cssv6h5syxvpk"; fetchSubmodules = true; }; }; @@ -381,34 +381,34 @@ let denite-extra = buildVimPluginFrom2Nix { pname = "denite-extra"; - version = "2018-09-20"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-extra"; - rev = "57ab8e6d8756e294c12a6177bef0155b736eaf1f"; - sha256 = "0in7dg23gh6h39jjn84b2sqkcyd02dvv8pvnp6c3413dnjzmiryz"; + rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; + sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; }; }; denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2018-07-19"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; - sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; + rev = "c86a6b2b22ac16544a8bccbefb608604f9252349"; + sha256 = "19rx46xd9hi7z1n9adxa9yf4ljv38jhwinplsszwlpcq518ac4i6"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-03-17"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "885ca6711b25d77ef69f9704c847d940ceae41c9"; - sha256 = "0f5s51axdpwl5f041rxdl53h5ldysf80kqkx79hkx9f6022b80z5"; + rev = "280ea09f278d7301910e7b6abefccd75400bec0b"; + sha256 = "0dcmbmwh29svin6gn4x5carlgy9plax64p4w0f0cx69440zhl4r0"; }; }; @@ -494,12 +494,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-03-17"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "a6ed6a909a238b1583b84496c60075f474421973"; - sha256 = "0s7qg4kzvj1sdc9b9adnxk4x0svnaxa6n7b2slajbbkxpj3bc1pi"; + rev = "19f1dc07f382534d16e5e21f2dddf5109d64ae68"; + sha256 = "1l9zpvh9hwbd32l2g8h0pq3xh5cixbmqdqznwrksx1da12v2w7aa"; }; }; @@ -527,12 +527,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-03-15"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "fbbf01311cec8aa8741564b361341c722379e9a8"; - sha256 = "1p0zx4r6v25qbq1avl2gyc4s3nsi9vkrp6vrq8kb3q2y1sx6r3p3"; + rev = "1dfd4d45eb169bba4a5d5a3a4210e663e4a18dfe"; + sha256 = "021qx04ka3w3w7wlv0p3lrpwxnlvxn0xkv7qwx6fk6594xfbaxi7"; }; }; @@ -550,12 +550,12 @@ let elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; - version = "2018-11-13"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "elmcast"; repo = "elm-vim"; - rev = "d22c0ba13afb554257a8c176962e2216cc18edd1"; - sha256 = "03lmbv4zkjdnyzrna7g9pqdgf3jqhi9g59fzjnay4af59hijs1v3"; + rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; + sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; }; }; @@ -584,23 +584,23 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-03-04"; + version = "2019-03-25"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "440ee9e14fc854cf5aeb0971e4ab8b9f5204fcb0"; - sha256 = "0dyw4d103h9cwxr2z19c6mj5sxprb47p865vknrf4yny9sdrqrcd"; + rev = "5526c8e9345f3c3953757bb13511e4bb49878456"; + sha256 = "18drq44lnh4d0pq6b30jiinlkylaq68llc0gyxvgpy6gy0k77gyk"; }; }; fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2019-01-13"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "6de79db47e6990c075ea0d05442a5cd4b6a650f2"; - sha256 = "1blsy9xfklviflnh2psn9xgnh1v9x4nnibfibmzsa0parpyczsfb"; + rev = "69d455dcf1ee40bf050a0d1e94f49f02bb2f4832"; + sha256 = "1hk9ir47c7rds3fya9vd2rsvc2mfj602fhqvz1h0acvxkqy34lsk"; }; }; @@ -838,23 +838,23 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2018-08-26"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "ac6ad259a5aa8be243d5e343d231942b026f1ec1"; - sha256 = "15ci15drs93qphmga0rr79hrlggrgmaia099j7n59sllhqn5zfbm"; + rev = "e552c65165b42df79d462d9222ae022116bdb26a"; + sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5"; }; }; jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-02-24"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "1f7e661d9d29fa1485e781eaa97a4491f952e316"; - sha256 = "1x96bjw25kmwgi86h0ama4xl6qrbyk7yia5fiw9qkicy1j7yk7j1"; + rev = "f26b2a8802ad47406a0ab1e7b68234fa22d88891"; + sha256 = "01bbs70j5z00rn4bmf05zvl3mavyv8w6faj59z0mldvxnfidw2bb"; fetchSubmodules = true; }; }; @@ -1081,12 +1081,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2018-11-19"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "d3b4d2860ec34648a2d6df4631718a6a7cfa5d40"; - sha256 = "0fqlnh2786wc9barmfz42z7qcp3cly82jhzrwhrx15z4sw4sbjsq"; + rev = "5f3e213c629b7fe1aa3723bf56fe3ead5555a526"; + sha256 = "1x5hnh7riv50c7ywnn2mch0rgks5r2y4k32y8bb616ld0xndaa4b"; }; }; @@ -1103,12 +1103,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-03-13"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "f9c53c383596b2c12d0bba87ab92bb67042eca33"; - sha256 = "1avgffzc5dxs783kr0nvb2fr6vc8vy4ypqlk74vlfq534gkky68a"; + rev = "8db90526af3655e32f803e18176150f593cd08a6"; + sha256 = "0vv81hxc2f53299xvb8m0px6f0kpmmr4h5h6h5wzqyg7xixfjg0i"; }; }; @@ -1125,23 +1125,23 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-03-16"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "716a6a44a7d6d80cb2e5f90220d31bf25b960e68"; - sha256 = "0n6ppv3m7yrahsd5khyvshrh69swfv5s5anjk6n1vab26kmd1c2y"; + rev = "36c91c3b8f0f731b3ab6a3a01a9eb2e1be15ab86"; + sha256 = "0fkkssy38hcp23mgbwgkcnmhlnxj7iqn2iq39k8g7fbhhmnbixik"; }; }; neomru-vim = buildVimPluginFrom2Nix { pname = "neomru-vim"; - version = "2019-03-02"; + version = "2019-03-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neomru.vim"; - rev = "8ad581e0925ecefb94a7d2251803e9b3ba78818e"; - sha256 = "0nwvx6416z1vhp7wyh862ifzid1fmj6ld5nyj4inn7b9njg9v8p5"; + rev = "d3d47938fb3f3205bbb9eb8796a5da33f1d7c2cc"; + sha256 = "0cvj2y6i55x04rcv8cpvgy7grgc0rq7z2sxjxn6xxi0ligqpvjp7"; }; }; @@ -1191,12 +1191,12 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2018-12-03"; + version = "2019-03-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "9ff9d9df82a7671c3ffd7735953d6cf269bac213"; - sha256 = "1jaiw86gvb6dnzwnzq7hp04cc3b9yibzw0z868izpnc1696hkb3d"; + rev = "6a41fd651c00b1ff6a6298cb2be088e8d27d3629"; + sha256 = "1p084xbycwkghfih41z1sc6nn2xi7471vj8zgc9jgw0qkxbmbcnn"; }; }; @@ -1213,12 +1213,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-03-07"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "288669db1fa888947deaf715d7469233f476909f"; - sha256 = "0k5420f8y311c717ifamyhqhqzlca2y9sy7qw3z2np9z7ms5dask"; + rev = "7513f256aa1d59b6a749cefe5ac505375b1b8a6a"; + sha256 = "0163bvsmnnw598x2nyi9lzdk6akzj62cbsldp8prhl6d7x3gdmaf"; }; }; @@ -1244,6 +1244,17 @@ let }; }; + nord-vim = buildVimPluginFrom2Nix { + pname = "nord-vim"; + version = "2019-03-21"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-vim"; + rev = "bfa069b12b3af000b07eb23c01ff516bab452db7"; + sha256 = "1wyslhazi9vwnk3z68ibd4gswvc340mwnffg9lnpskqi56qpw005"; + }; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -1312,12 +1323,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-02-27"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "c4a4dfdc21c14f58c12d077242ae33b729c894b2"; - sha256 = "01136926mr8z0b78srzvx6wkm8ipf3hv2vb8cj5sj8zgq6xs7kwg"; + rev = "6f34e06ac4b3e1ac7c5755a0216791066fbe74c8"; + sha256 = "13kdglkxdwxpmv0xwcwgzivb8x74bfypw2xn8w237niryvxg4y7z"; }; }; @@ -1455,12 +1466,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2019-02-02"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "493d80ef7a4f16926d10b8c3923cf69c5209fe34"; - sha256 = "0nqs98g6lq45yrrlwgxckkgq90n73s7nibih2906s0zvsr1x95s8"; + rev = "abc1073aac08279523c35546e4a2c85cbd8d656d"; + sha256 = "11y6ha65j35cb73x6wdcwqs7k12lcdd38ygirsmhk4216mnl2p7f"; }; }; @@ -1521,12 +1532,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-02-18"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "fdb2d39fb04b139fcdb9b707f9b2ccc219566632"; - sha256 = "0vamhy95gkjybikcf5cifdd66scjf4wmjh2nw67f65n4narw1lps"; + rev = "2234f0d3f8204b44f30ff6eb3b6f7345c23aef92"; + sha256 = "1s0v14na6vlzazw95ssfcqkpylnqxaj7kh1qyni97ixiqqw7vrjw"; }; }; @@ -1708,12 +1719,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-01-08"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "d6466f6f281f920e178637882a2e6e4f40c3acc2"; - sha256 = "04fzg94y37hm917klzz2k0j26wacnf0848nwa8br9b9vx5a6ixnv"; + rev = "5915a1a3cef7c60dbea2ff50153417e5f6371952"; + sha256 = "1013d1rkdg6ddnsf0j033q0a14aq65jbv2wrkj1d6i5jr4zjh3f0"; }; }; @@ -1763,12 +1774,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-02-18"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "2bfc63174002903e350de418006eea83efcc8901"; - sha256 = "0k88j7k4jnjql98v55r70kw1igg2s2jaw5lvf9adi3pprsypszf8"; + rev = "1220a0ca044ce9a1622ec2aa60d0d9ef5e801cb4"; + sha256 = "0j7yhhgfl1ymqkl5lp9vqm3w9l2jkf863xpffw9f0ddmjmk3b7am"; }; }; @@ -1829,34 +1840,34 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-02-02"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "b55994a18b19499f8de19cf7ea48670113a45e4f"; - sha256 = "1mcspmnd7qvscf1zxn0i7gzb4yxa5xcpg7piyvssx9nbb8w57jr1"; + rev = "e1d3bb9f836a8645807b790345b69666bf22bb2f"; + sha256 = "0i0lys3926s7n6iq03fg0flsp2rmvzwvfjmldcv31vjjrhzlbqmx"; }; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-03-06"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "bbb0826fc2641f2b0fc3beb2ce5fc506515a4ffb"; - sha256 = "1ribz8g5jfvq160957p8b98ihb1sh42w1k670s65i6i45vgkws9r"; + rev = "f11dfab88b459087cd113cd9a0a0d77c06db565e"; + sha256 = "0wghhiwyc8rvzfdm3i5dq8s09sdmkr32kb3s8scvxvcc8b3h7wll"; }; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-03-16"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "f46e029b4a1cb16c014d8ddbf88e9d361fd2fcf0"; - sha256 = "1sh72zjjg12s6jx1vinj7j3mnx03mb4s44mpa4y62r78j48pfc0p"; + rev = "9b856347b905dc616baf02b48d7631bc3084726e"; + sha256 = "0w9aj42hb8x7601gbgf0ggs7p3sm5wrv23bnvrjgdlf3mapg6dwy"; }; }; @@ -2082,23 +2093,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-03-16"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b84e5485221096dc8c2bbc18f130e52265b367cc"; - sha256 = "0cflxpqiqs4dy0jplbciwy3v7ybxj1wmfijic0z6gvbcj6h0hxsv"; + rev = "86e73cade71651263715f21e58eed87cfed4518e"; + sha256 = "0xlvnzsnfkzg9qz5n87gvm75xlhgihf3y300zxvsyhk6ihnajyzp"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2018-11-15"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9"; - sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8"; + rev = "78cc30cb90b50fab024098bf2a55a4441665ff03"; + sha256 = "15mddh41vb44p1ppcsk3kb50fhqrlkdv4bmr2r7crny53cjfslh9"; }; }; @@ -2126,12 +2137,12 @@ let vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2019-02-26"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "d0ef603f037e8abf24ae1d959566722427a1bf92"; - sha256 = "12nqnvdhqv6wsksnd7hd3llw8vyxn0r8v98r0w1hsp7hw8mn1cgf"; + rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; + sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; }; }; @@ -2203,12 +2214,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2018-12-29"; + version = "2019-03-27"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "54d1eacb2e96f6862894bff53a48846b6470e870"; - sha256 = "1j88my182dwlvwrnfpkdgda4qgam28l7hdmmfgjh6h745ax0mghg"; + rev = "b4aafd5b0f7e5c2b44ba6d92a18196331ac1003a"; + sha256 = "0plr53xaavwwxvzk1rb724i1cpknh6z09zvbg2y0bgl5cj51b665"; }; }; @@ -2313,12 +2324,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-02-22"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "83808e891068490f2b2325e39edcde5c585bd4ea"; - sha256 = "18j3sa36zz5vx6hamdmjl25n7ilvh1q2fqfqs6casbdnqmmds1dy"; + rev = "3a23ac26fd68a2db158cbe3c2ebbae2c142861ce"; + sha256 = "1n324w9dxp9h7k1bg1hhad5f7pva05kns6mqd5d3yhsidfsxshlb"; }; }; @@ -2335,23 +2346,23 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2018-12-04"; + version = "2019-04-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "d33796c460229b2cf0dd09fedf1b272da9d13a42"; - sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd"; + rev = "ae60a79106dd32d75d3c5cf4dfe44fd658d634ec"; + sha256 = "1dpyavqhsn7japg5li2fflhn4rq5y5c5m24772550awzd5nx0bif"; }; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-02-28"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "929e0d0aa1139d483c070e4ee2a05f4a3425b0af"; - sha256 = "05js06pvrvjxpwhdp68hmzxskfacmkj2i15khav75f93rsih75dw"; + rev = "178acd05aaf26b14afd0a29f8e1c318ca96637f5"; + sha256 = "1qxblrwm8zssg8zavfxq3a43yz69fk4ylqgxbi6mq3hvz3bnkb6k"; }; }; @@ -2390,12 +2401,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2018-06-04"; + version = "2019-03-23"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; - sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; + rev = "85e90c9759e14633d878ed534ef313876ab96555"; + sha256 = "1n5rlqh685ba96mwi407x3r7vlxd34awlyb2wjmz6j8m0ld3skrq"; }; }; @@ -2423,12 +2434,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-03-13"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "d58efec5cef84c0a6eaeb0fea39e273ad438bd39"; - sha256 = "0djvnxirjjd9shyr76xy2saqbiw9albavddsc1vnsxw5hzlamfc9"; + rev = "d51d5f7eb5c46992ac718ac648e02e38322e073e"; + sha256 = "1n95zybvncfz5w4h77li22dcskb3xpf0jlfrw9g5ix80w1n41aar"; }; }; @@ -2489,12 +2500,12 @@ let vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2019-01-10"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "c6b43f88e4cbce052843e8cbd9593cc7753208fe"; - sha256 = "0z4c2n8b9vi19qqdmljyms173dmkiarlf4yxx1ix1wvqmnpcr6zf"; + rev = "ce9ac790430699d346aa074d7f339f2e738284e3"; + sha256 = "1dlpmsads32c8v49dqgnz1d06bh0aikgl1xq2whiimm2va9vfjng"; }; }; @@ -2511,12 +2522,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-03-01"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "bd0b87d36ad80e8acd94f22028d15ebb441b1c28"; - sha256 = "0ira81j7n2gvrpracag8393yxs5ya4wl8g5ygngl65qrk7y0bj0j"; + rev = "1b3668b89fee230c6025dc47c01c82fc1e282ac0"; + sha256 = "0b2z44cw71c0awlajcsln4b43kchhwlb90l461vq7ipmwp3wm8r1"; }; }; @@ -2577,34 +2588,34 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-03-17"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d769e0909d8a256f6e1031c98abaab71dc4eedce"; - sha256 = "0n6wl472rd2v6qiddpxs9bcg1fgpv1c5y3aax1njyvb1wic1yx35"; + rev = "f04098811b8a7aba3dba699ed98f6f6e39b7d7ac"; + sha256 = "01fsyyqlf1kygy4l3kbb1jcydgaqjmhhzbdf2liv3hx42signcqw"; }; }; vim-grammarous = buildVimPluginFrom2Nix { pname = "vim-grammarous"; - version = "2018-09-13"; + version = "2019-03-30"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-grammarous"; - rev = "65e01dd1f19a4cbaade139754d6e8c8cdf45c33a"; - sha256 = "14sjvspnfj5jxghh1vndaxfglr0ypnn59nzrhxnymf6q3g930vcl"; + rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; + sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; }; }; vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-03-15"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e638f75a211885e4b48abe1809db18b108208ce0"; - sha256 = "150ijh9qpvvas9njb0nva58s91g06nbd2zxv9glvbirk75j9d3bc"; + rev = "1b31eeed2fd672300dc0c52ffbb23397c7243215"; + sha256 = "18i241a6v0mdzyznwr0al00zvnr0rqfz0khpjx730w6vk1whrp52"; }; }; @@ -2808,12 +2819,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-02-25"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "8450f06ec2c22bf33934728953b722a3847bbc18"; - sha256 = "0k6zxqd20n003baczgvqfvscblh4qg9lymc0w91pyz7lk336050h"; + rev = "24c896e13d9241024bdb79f48e811748654d7ba2"; + sha256 = "1c89n4rzjdq12h6wjz04np14hnd33i7fyrxlxv3yyl3hdcvs8bk1"; }; }; @@ -2875,12 +2886,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2019-01-18"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "c05db65464e26aef281d4c1e0006d0504f2f76d7"; - sha256 = "0kq44q1ays0wwlfb3yqrfji3bfxpvbsrpzpp9dcf84836p0fpr1j"; + rev = "fbb88789b531e1fc1abe25b2f44f4f4c8a73f14d"; + sha256 = "0661dnm0idaqy28pw03fznq5hpl2pbb4r0c1gvdmf59ywhsa2dav"; }; }; @@ -2930,12 +2941,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2018-11-06"; + version = "2019-03-24"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "e84959d05472ce2000883b1f73ea34302894bdb9"; - sha256 = "1w421wbshxic9yd5862i8c02a9xhnfidrkrj1xi7lxjh71r0kdlw"; + rev = "08f1389285902473a8b2de045c2d916fcc5affbc"; + sha256 = "1sfcq50f5gkpwa2c5szi8aa7h2x50ki87knba8rsq58h58pgbnq1"; }; }; @@ -2952,12 +2963,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-03-16"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "16f4f994a0414766ee1f1da069eed5230e409b53"; - sha256 = "1wkv09g5i4wgv01q9lvr5bnmpd5ai0xng0yah06faqn56cnhbawi"; + rev = "b02690e167a1b49373245aabbedecd29aa470309"; + sha256 = "0gaqcjdq7rykp4hbac7ibfd3lr19vy9pnzwkn2cmnv18b5sjpbm1"; }; }; @@ -2974,12 +2985,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-02-28"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "691d961a643064ee1feddba8371ff12e44678f5a"; - sha256 = "0yhqszqjfbgyyqkw5ayl2732kdw71dq6s3yg3szcilz2h6z21m7c"; + rev = "a15334cac67237835e62c9dd1470f6162769779f"; + sha256 = "1bdi69ni1mgc9x67k8l886bch70jhi4hi5ram1habml4vklr82np"; }; }; @@ -3007,12 +3018,12 @@ let vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2019-02-21"; + version = "2019-03-25"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "9d40797a352b4e9e4ca36026ccb92fc379f0cffa"; - sha256 = "0pvmij11b5vdxl2dxpsf4qfyl3fify36npbphwl4jq664dz5akdz"; + rev = "8cb8e83ffb040f25cefa597f21608ca6a64aed70"; + sha256 = "1mdi0kbc1k4q8mw8f4anl819mgsll1sj38dd2w1a1lscg179j062"; }; }; @@ -3227,12 +3238,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-03-11"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "1d45a6d4f094127b113470d7710695b280224933"; - sha256 = "1lcvj5q8x0vmx8rnsn4aa2js7ihz99i1b5lj13vlws04rlaf3iga"; + rev = "a55b6aa3aa797c989a4979a13a5bd2ae11cfd4a5"; + sha256 = "0mgxbyz1yimavay54s6a5hv88d497qngp4i06g248d0qf3ivyvrv"; }; }; @@ -3293,12 +3304,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2019-03-01"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "a2bb7be01815dab286735928001a009bcdb0d946"; - sha256 = "1yrg74h2lha4h1c1gxxj2sy462gn6h000bikhfbqk6lmqk2x9afv"; + rev = "ed236e0e3fa9d4c5c286581ee68b6fa7d976674b"; + sha256 = "13gq9qrqdwyiwk6whv4ji77xswbwphji1zgrgiid9l27a9ald43s"; }; }; @@ -3326,23 +3337,23 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2018-11-16"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324"; - sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr"; + rev = "57a350e6327af0074c4bc0d30b62662dfdb993af"; + sha256 = "1vgcy8xc8v0g5g4h1h6dcl0ggg2rxp2pisxj04w5d78qf8b48njc"; }; }; vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2019-03-13"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "4abc4340abff09698fc5c8fe91dec87e3c3e2255"; - sha256 = "0nfhan8gwkv30k7wln2a5b4a144jihnl2hmb8jwrlhw11hh5nrlx"; + rev = "96d5db458f868255393fdc2732d6bef21a45c68f"; + sha256 = "1nv51c441d44igjcb3hlib1zbd65h98ywkjyp50hbz5rjkx17mvv"; }; }; @@ -3414,12 +3425,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-03-15"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "c38d4002e025b568fcd7c26f3fe68cc78c5a8f31"; - sha256 = "1hxbzj7nmf29n4s5nxqm7y7srcxgdl60x5h6mxmvng5b0c9hlbb4"; + rev = "f34fea0eff09d0fb4ec54aec3c07345e6c4486d9"; + sha256 = "0486sqmz33qcvizdicssp4lajgh2rv0sskz6rndpd7qnm54mn968"; }; }; @@ -3436,12 +3447,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-02-08"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "1ff17cc7e8eeaf660daa5efee9e66ef83e00e686"; - sha256 = "1mrgpkyarc6igd7anzlwpbis6cwsy759ssxapfxmj1q69hyvmdl6"; + rev = "9035bef4c91fd730d76b5fdc994f1dcdcef49405"; + sha256 = "1f65nq1hgvblm074hbqy647vixzhkimr1yhqjlrqg7mjiffrkr43"; }; }; @@ -3469,12 +3480,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-03-11"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "08f95628717ebca76e60643e76a84904a4520051"; - sha256 = "1bdmdi72zb87rjz6h03zkmvw2nvpqifsyx5imhz9lc7kjgw53k47"; + rev = "4214407a5eda0d49ad591e41b6eb91f4682fa81f"; + sha256 = "1jvbjnfwpqc53vp5plwyvqnkabi4h6d67sg4dg3byrfs3d0rpzmx"; }; }; @@ -3513,12 +3524,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-03-12"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "a56917282b58c047c64d560aada4029dafeb05ff"; - sha256 = "1g1imvyz34x75c6b9sr4r75ph0zbzy2gglq82mgld67vdpq14ww7"; + rev = "e4d35cc913336d4e17e147c88120e10f58562b4c"; + sha256 = "1kqx113dmsv8pm88g6lp8ahkyib78zln3iz4cls59r1803q1wf97"; }; }; @@ -3546,12 +3557,12 @@ let vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2018-07-23"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; - sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; + rev = "ca58a2d886cc18734c90c9665da4775d444b0c04"; + sha256 = "0d4jxp1ahwrwsk277yvkbk76jrhmv3bml83fivlxpj01224kdr2n"; }; }; @@ -3568,12 +3579,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-02-20"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "fdfcb85fb3765f6aede3e909401c24a65e318740"; - sha256 = "136xqj246rckpc01h5y3ax6mnrhb0i22api8wd2dlqsh53glp9p6"; + rev = "a40ef26c5cc1806d3faae829fa149506715ce56f"; + sha256 = "0fis0w3xpsg4wfss61vydic6zisg5bdyvb0wcaf5z4fs5sk380x6"; }; }; @@ -3601,23 +3612,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-03-13"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "e7cd4746946205ab03039f2d0d0af3c0d55d4c4d"; - sha256 = "0fv9w5hadyzp871p739mrjsfj0m4xang3lkz3gsv1cxw3iglkfld"; + rev = "a44bf0b1a142bb39e84e5d525f7d98b5d3a66057"; + sha256 = "12wyjfmwz3lsd45vv4ava361ph6gravggi9vvvr9qgf5zc1shd3b"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-03-12"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "d6ef5871ad7cbc73ee9b1bf1ff3a2b694aa3e3d4"; - sha256 = "0r36q8qqlpkv28byv62f0sqkj1pvnn58ay2c45mzh9awvc47qs76"; + rev = "3c151018ce62b526e0bb4261b416a892c3945dc1"; + sha256 = "0w4lh9l3fh3vfggy6am34vhh1844v3lqhv9fm22y9yvdjf995aa3"; }; }; @@ -3634,12 +3645,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2017-12-27"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; - sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; + rev = "f95b4a888a91cc9373cf2f801658287ff984592f"; + sha256 = "149zspfxdnp10lj8vv7lvbck8bascpxc1kxjqpn00wslw7rjs5yg"; }; }; @@ -3689,12 +3700,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-03-14"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "cb23e3f94abb9db01df5e57cc1ac23a4f42aa6a7"; - sha256 = "18jhlbs93qva5bdwl0j1p631r58j2ppaq9y9ka864m5hjbzvfnr6"; + rev = "e77923053fbce11323194ed04113b8d966be959c"; + sha256 = "1cka410c94wa6mz0pr4m8n9j7s9jhqnw513479pkmzx435ffb6ak"; }; }; @@ -3722,34 +3733,34 @@ let vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; - version = "2018-11-11"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "e306929b27bea08ab505de7a4617e642b56b6dcd"; - sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16"; + rev = "c7b133a66ec9dcf2200d1d2a4a7ad38909c5f539"; + sha256 = "1bmpwh0lhdbh6z39w2i27rirc6iy3jd89gp47xmfmgvw7fk1szn4"; }; }; vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-03-13"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "5ccfd1b31a290fdb5ee50a31f1629ed5df5cd8a4"; - sha256 = "0avldkcnl1nbz09lq58yrh9cw6gia5wyz3li1gck85j1cnhf1c8x"; + rev = "fdd56e0e1b0f9cafc0268076c4636f97ccd081dc"; + sha256 = "1b1m4d1dn1ymqrj6bbl44hnmf0rh93jipjlrrbk9gr3fc0x99xmh"; }; }; vim-watchdogs = buildVimPluginFrom2Nix { pname = "vim-watchdogs"; - version = "2017-12-03"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "osyo-manga"; repo = "vim-watchdogs"; - rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; - sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; + rev = "33d74aaeb1ef71512baff9eea20a42e06f4f0bc4"; + sha256 = "0jkkrlw9x524vvsggq51z0yyvys75dv2h21ijxzdqni49kf4vyhk"; }; }; @@ -3777,12 +3788,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2017-03-27"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; - sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; + rev = "3c968fd4fd83d3631dec4c0caf289c85917d8ca9"; + sha256 = "17ncq06al2pzqxpx45bmh4b66d48y3kklxcd1f80jfsp9hh5v0vm"; }; }; @@ -3854,12 +3865,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-03-09"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3e23e22d1d15575c25e656503d3a650ad91d0ea4"; - sha256 = "15mwmfgl9w1j8bvida59k6hydgx2x7a78j611lhxrnm89fmkxfka"; + rev = "068ef61e6e9364093272edc4f0cf997a349c0a98"; + sha256 = "1p81l2ckl1s2xddzhd9fxjsv9a6vhz77gn5jxwlp0in284v2lp2i"; }; }; @@ -3876,12 +3887,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-03-09"; + version = "2019-03-24"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "5ab8f8672e6832da8f5a7eb371d2b24e8e0fff2c"; - sha256 = "0rcwng10l23gqbp3mc3i82vs56jzq5dikgcsj875bb9rhi23driy"; + rev = "6766c37ce09a623b3de7ddb86ca30278eea37a82"; + sha256 = "0qz4yx8l0mmwv3s3s4l03af32dymj4b1sz2x4fpdx42g04k1avy2"; }; }; @@ -3986,24 +3997,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-03-07"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "cad825d5af13a59a17fb10369c2d89508f4cae3e"; - sha256 = "197p0gs6x50kiwf6p4r3r5a1paz2lm089xb8zq0xvlab8fb6mfyy"; + rev = "2126e8306cd21a58fb5e089376af8272abe36bb5"; + sha256 = "08pdwq3cw7fszw75450z404ylcb5nni0p350jxsd7bd3vikdfxp9"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-03-14"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "299f8e48e7d34e780d24b4956cd61e4d42a139eb"; - sha256 = "1ix7qv2ijs2i49p6c654wvsqcar25w4w71m0f8i4n0bh7wgc1g33"; + rev = "25ebc0b9abb1b135c809ee850085a0305cbc5533"; + sha256 = "0jv8h8wx8486n8add2ispcr7np278rvdndb2az4s72plh59xk05d"; fetchSubmodules = true; }; }; @@ -4043,12 +4054,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-02-22"; + version = "2019-03-25"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "1036ba58daceb4df155f4b14485eb4864b4c7827"; - sha256 = "0023rdin6n4d1hyxslp3cdag41y4yby9b7ckxf14yxg66v5ylm54"; + rev = "d9b8d83369dac67214097fa79c9c504d6e1ede41"; + sha256 = "1nxlvaxnspmf5gwjm3scqhpj4a7y1db1062dskpxqjp5qnixacp2"; }; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 23914e02c01c..c3865fa1e00f 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -2,7 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchgit, fetchurl , llvmPackages, rustPlatform -, xkb-switch, fzf, skim +, xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake , gobject-introspection, glib, wrapGAppsHook @@ -405,4 +405,12 @@ self: super: { }; }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ + 'g:stylish_haskell_command = "stylish-haskell"' \ + 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' + ''; + }); + } diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 101ac0a21121..ba153ea9bb5f 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,6 +11,7 @@ andreshazard/vim-logreview andsild/peskcolor.vim andviro/flake8-vim ap/vim-css-color +arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 9117364b8205..1c4c59f4ecb1 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vscode-utils }: +{ stdenv, callPackage, vscode-utils, llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -52,5 +52,19 @@ rec { ms-python.python = callPackage ./python {}; + vscodevim.vim = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vim"; + publisher = "vscodevim"; + version = "1.3.0"; + sha256 = "18z24w7smjjnv945f8qyy6dl95xckyqa6gg3gijfcigvq5sgyawc"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + llvm-org.lldb-vscode = llvmPackages_8.lldb; + WakaTime.vscode-wakatime = callPackage ./wakatime {}; } diff --git a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix index df69cb7065ba..746eeef83668 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,13 +8,13 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.7"; - sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn"; + version = "1.2.13"; + sha256 = "0zidlc1flgw8h9l5ph98xh6anxhggk4vpmq6k1k2sfzrrjypymgf"; }; postPatch = '' - mkdir -p dist/wakatime-master - cp -rt dist/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime + mkdir -p wakatime-master + cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime ''; meta = with stdenv.lib; { |