diff options
Diffstat (limited to 'pkgs/misc')
24 files changed, 283 insertions, 222 deletions
diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index ce097bd5f23..b98560992e3 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; - makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; + makeFlags = [ "INSTALL_DIR=\${out}/bin/" "MAN_DIR=\${out}/man/man1/" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index f38ed7f0309..0c91b782117 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = "-include stdio.h"; + NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; meta = { description = "CUPS back-end for Canon printers"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 29586f3fb55..13bb63ca709 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -245,7 +245,7 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index d4f15992e74..9bee05bfb25 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -24,13 +24,12 @@ stdenv.mkDerivation rec { substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} ''; - installTargets = "install-cups"; + installTargets = [ "install-cups" ]; - installFlags = - '' - CUPS_FILTERS=$(out)/lib/cups/filter - CUPS_BACKENDS=$(out)/lib/cups/backend - ''; + installFlags = [ + "CUPS_FILTERS=$(out)/lib/cups/filter" + "CUPS_BACKENDS=$(out)/lib/cups/backend" + ]; meta = { description = "Foomatic printing filters"; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 8a8556b63df..ad7659d060a 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -26,11 +26,7 @@ stdenv.mkDerivation rec { libusb.dev ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=parentheses" - "-Wno-error=unused-variable" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; postPatch = '' # remove vendored dependencies diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 8ca83c2c93d..e2f2bcc2f24 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 39a7e38e034..0d4c7ab7216 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -11,7 +11,7 @@ let rev = "244f8bbbdf64ae603f9f6c09a3067943837459ec"; sha256 = "0x4y5q7ygxfjfy2wxijkps9khsjjfb169sbda410vaw0m88wqj5p"; }; - makeFlags = "CPU=m68k SYNTAX=mot"; + makeFlags = [ "CPU=m68k" "SYNTAX=mot" ]; installPhase = '' mkdir -p $out/bin cp vasmm68k_mot $out/bin diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index d8717b46eef..ca6ad37b5aa 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation { +stdenv.mkDerivation { pname = "citra"; - version = "2019-05-25"; + version = "2019-10-05"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "186ffc235f744dad315a603a98cce4597ef0f65f"; - sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn"; + rev = "35690e3ac7a340d941d3bf56080cf5aa6187c5c3"; + sha256 = "11a4mdjabn3qrh0nn4pjl5fxs9nhf1k27wd486csfx88q2q9jvq8"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 358cc59d3db..ad111a61514 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - makeFlags = "LINK=gcc CFLAGS=-O2"; + makeFlags = [ "LINK=gcc" "CFLAGS=-O2" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 668d1804544..722f6b25429 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, fetchpatch }: stdenv.mkDerivation { pname = "emulationstation"; @@ -12,14 +13,22 @@ stdenv.mkDerivation { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + patches = [ + (fetchpatch { + url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch"; + sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p"; + }) + ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; - buildPhase = "cmake . && make"; installPhase = '' install -D ../emulationstation $out/bin/emulationstation ''; + enableParallelBuilding = true; + meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = https://emulationstation.org; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 74e35379137..278d8d8dc5f 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # For pthread_cancel - cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s"; + cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ]; buildInputs = [ zlib SDL cmake ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c8171f6c233..45ed31168f0 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -720,7 +720,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; }).override { - cmakeFlags = "-DLIBRETRO=ON"; + cmakeFlags = [ "-DLIBRETRO=ON" ]; makefile = "Makefile"; buildPhase = '' make \ diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 34e3961250c..3f14258b0c0 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ] - ++ optional withVulkan [ makeWrapper ]; + ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit - ++ optional withVulkan [ vulkan-loader ] + ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 057615a79a1..0b6eab70263 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath " + path) ( + NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) - ); + )); # Don't shrink the ELF RPATHs in order to keep the extra RPATH # elements specified above. diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index aae469f3005..5487b6cdc2a 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,24 +1,32 @@ -{ lib, fetchFromGitHub, python3Packages, lilypond }: +{ lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { name = "frescobaldi-${version}"; - version = "3.0.0"; + version = "3.1"; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; rev = "v${version}"; - sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; + sha256 = "0sv6dc1l34rrhfbn1wqkl9zs9hiacmmbviw87d0d03987s1iirb1"; }; propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly sip - pyqt5_with_qtwebkit (poppler-qt5.override { pyqt5 = pyqt5_with_qtwebkit; }) + pyqt5 poppler-qt5 + pyqtwebengine ]; + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + # no tests in shipped with upstream doCheck = false; + dontWrapQtApps = true; + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + meta = with lib; { homepage = http://frescobaldi.org/; description = ''Frescobaldi is a LilyPond sheet music text editor''; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 541fbea1dd4..37974e41080 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -76,15 +76,19 @@ stdenv.mkDerivation rec { sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac autoconf - '' + lib.optionalString cupsSupport '' - configureFlags="$configureFlags --with-cups-serverbin=$out/lib/cups --with-cups-serverroot=$out/etc/cups --with-cups-datadir=$out/share/cups" ''; - configureFlags = - [ "--with-system-libtiff" - "--enable-dynamic" - ] ++ lib.optional x11Support "--with-x" - ++ lib.optional cupsSupport "--enable-cups"; + configureFlags = [ + "--with-system-libtiff" + "--enable-dynamic" + ] + ++ lib.optional x11Support "--with-x" + ++ lib.optionals cupsSupport [ + "--enable-cups" + "--with-cups-serverbin=$(out)/lib/cups" + "--with-cups-serverroot=$(out)/etc/cups" + "--with-cups-datadir=$(out)/share/cups" + ]; doCheck = true; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index f5e8b60cea0..9dadd085067 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libX11 libXext libXrandr ]; - installFlags = "DESTDIR=\${out} PREFIX="; + installFlags = [ "DESTDIR=\${out}" "PREFIX=" ]; postPatch = "sed -i '/chmod u+s/d' Makefile"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 4d4e1c1fc41..cefcdbc75a3 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "Launch a given program when your X session has been idle for a given time."; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8a07461bb2f..f3b6c6aa676 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -129,6 +129,12 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootBananaPim3 = buildUBoot { + defconfig = "Sinovoip_BPI_M3_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootBananaPim64 = buildUBoot { defconfig = "bananapi_m64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; @@ -300,7 +306,7 @@ in { ubootSheevaplug = buildUBoot { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; - filesToInstall = ["u-boot.bin"]; + filesToInstall = ["u-boot.kwb"]; }; ubootSopine = buildUBoot { @@ -314,7 +320,7 @@ in { defconfig = "cm_fx6_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; - buildFlags = "u-boot-with-nand-spl.imx"; + buildFlags = [ "u-boot-with-nand-spl.imx" ]; extraConfig = '' CONFIG_CMD_SETEXPR=y ''; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b83cc814511..881cc2d62f3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,12 +39,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2019-12-08"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "fbb55d9ef8829630ea8f12c112bebc69c7a15337"; - sha256 = "0fg43ggaxpnybc9ism4b5q7l0n6rdgh4vkpch80x89mwld287lqv"; + rev = "e5bd3f1439f95a33cb8692f1d49f570eb626c70a"; + sha256 = "0i1h1syk008xwwph5kz0jg8rn0b6l1jmdx6hlxq6nr32r5kifhni"; }; }; @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-12-03"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "5f84325cd811ec179b7f3642652438c6a45b174d"; - sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2"; + rev = "4afbf2f25dc0ce86b118261b0cfb904c80ae6ba0"; + sha256 = "1p2g745gyhzs6qql6gnwsn2yxvzf2409andbd8xgrc9bi9cn25pj"; }; }; @@ -336,12 +336,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-12-16"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "2408fb2c163aef22857645b58537879562373fbb"; - sha256 = "1cffcrmz72cn9sd7yl5z4r9yqzavh9dd9pjhxyjy80g5f0ryxc93"; + rev = "f2a24f2e35350811845c6a14438a94341217992b"; + sha256 = "1ramsl7dpgh9l801jq9g8jpg2n757c7r6w8jgfx6gpqmm47iqgrs"; }; }; @@ -422,6 +422,17 @@ let }; }; + coc-metals = buildVimPluginFrom2Nix { + pname = "coc-metals"; + version = "2020-01-03"; + src = fetchFromGitHub { + owner = "ckipp01"; + repo = "coc-metals"; + rev = "a2c71dc75b35251549d1ba2cdb5f9ee286ab9f90"; + sha256 = "0hzd7m1rli2vgwvykrv9ld5q9na867l5d56fl02d7d3q9ykfn6j7"; + }; + }; + coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2019-09-23"; @@ -435,12 +446,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-12-09"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "08ad1b1565960b41005bedbbd051f90c8edacc3c"; - sha256 = "0wfjs9hj11b0zfryfa2jnclgx4sfml9wvpjbwdqhhzz20ahc1jsh"; + rev = "0203f18c66f8bb06a6845aef1fff26a56e4a7bbd"; + sha256 = "08z0c0a1cizyv15h8d4mxb6casrgmfpdgj0w8g1v9zqra2rmkmv5"; }; }; @@ -501,12 +512,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-12-10"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "3ffd09dad94f6f41dd03cf3cec2a6b92a7028702"; - sha256 = "1qrkgva9yjjbjyflwaqfk84ia2vd5956ikjkmjfhd3gd52kh7hlg"; + rev = "b57debd2faa71118258f29968f17b3cd06664b1e"; + sha256 = "1jk20qjr5az6hjxrmjm8vdq0ks40bq55cw0y7xsmivw6cb61m367"; }; }; @@ -733,12 +744,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-12-17"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "012cd2637d48aa33541078451d70d66930e03e0f"; - sha256 = "1gaqxhpzskcc28qma6vcjwig8v3q3a8sf7b2ckm14i7cb4c1lyh5"; + rev = "ece4fde5a377d52ba737b991b8a320ada5d1ac95"; + sha256 = "0aqxvhv70mbsr1gsybs8np82nhvixydivnbj2jp8cy43c1hvyxlh"; }; }; @@ -799,12 +810,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2019-11-28"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "4dc152ac826a825b69741cc79681a257e24497dc"; - sha256 = "1j9hgz76x554wzdz9ss14c94pwp2fk7yplznhyxamndn9wcy8yiv"; + rev = "aa1b5c762bbabaeeb5f3eca976e65bbb2f82a883"; + sha256 = "0pfsky4i4h769fjmrvy89d9ickkfifvmq0m54c6qhs24bycx0s7j"; }; }; @@ -843,12 +854,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-12-16"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "35ceadf33e1248caead987fc83f01336b81d98fb"; - sha256 = "1bazm1n2hqgg13yp5gywzghq310qhkbfqg1v42lyvc0gax8dngzj"; + rev = "908cd3a3fe5b03783da7186441b2fe0c146f31b3"; + sha256 = "0qrz0mrrx79525rzab0l1qx3q49531306b05hgqrlkzx9zcppk8l"; }; }; @@ -888,35 +899,35 @@ let deoplete-fish = buildVimPluginFrom2Nix { pname = "deoplete-fish"; - version = "2018-09-15"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "ponko2"; repo = "deoplete-fish"; - rev = "9b9a686186e6484163b34eb6e620b83be355e82c"; - sha256 = "1v7ay0isrgcz0hgyggdqvmrldz0in26prj7p9l8ygkyrjq2w6b8a"; + rev = "4d27bfeff0269ae66e88645613a2b18ffae7a969"; + sha256 = "1l84dywfvgxclhicwdkdcqr0hicmish44c456g7vcdfqq97qvzp1"; }; }; deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2019-12-21"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-go"; - rev = "bed0a49705caf350e4f1ac51172bb3021a723734"; - sha256 = "022n512rr4szw0jn10d056qc5kaykpkqjlgpnnlfq00i1ns7gpm6"; + rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487"; + sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; fetchSubmodules = true; }; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-12-13"; + version = "2019-12-22"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "7990447a308c6c5839ada856f31a7dd3e34f20a4"; - sha256 = "1570k79ihz6kif85ichdgdnbipbdkqb5ks8izhqppb68lajyjvd2"; + rev = "63beb118c8d215bad4f8759b84608fd463abebc5"; + sha256 = "1rilqprq6fq01qj1idgvy38p827gjq2bsx93xfbim6yc4hkj10d9"; fetchSubmodules = true; }; }; @@ -945,12 +956,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-12-13"; + version = "2019-12-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "ca4018c69aca115033f3e3b5408331e76ff64cd0"; - sha256 = "0k3vgikvjapqniz0cmnhjx4ds5dn4kscd443sf2x2nd6ppa6fd6j"; + rev = "0985ba9f5a5f35521087b9ca0858c96ab3785158"; + sha256 = "09bfsd217qi1ndfrfrjla1vlhnp8r9q9qirkwjjajbqhk4ws90pm"; }; }; @@ -989,23 +1000,23 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-12-18"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "18681650e81e809cd56e1006cf92cd7f9108266b"; - sha256 = "0rlh97bdmiagrxs9gqjvrimpqcj9w0ys77l0kyxb111zcgcr8s9s"; + rev = "840c46aed8033efe19c7a5a809713c809b4a6bb5"; + sha256 = "09bivhh6iig9vskia9fz1cz2c6dbn3xf4cgm77z9ppaii00n9wh3"; }; }; dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2019-12-20"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "016420bcae13eb13d47fd6717b0d5905e79d6dde"; - sha256 = "1j15nrv3cdcjxssspzw3zz77kmpkr5r4w00ili0br2a4wlr94id6"; + rev = "607958520f8bd4308fe52937e211f6db4ad84cf3"; + sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817"; }; }; @@ -1044,12 +1055,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-12-10"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "53c56fcf358ca36b00b9cbf7dd70642c8922fdd0"; - sha256 = "1i0sk2s10ac5lagvn74m21lxsss1h4nfnn51lxnaflqbvlba4rln"; + rev = "7e5b4a91ad55b992247edb87543ed7855db1a199"; + sha256 = "0cbdk4bxk0alq69fjxk4ryfk1w6pvjkqp2sv7rj8qgrwgpqdv5wd"; fetchSubmodules = true; }; }; @@ -1101,12 +1112,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-12-14"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "55ef64a057025209c48905df06f725430e63542f"; - sha256 = "07qca1xmwaak45ccgv5vg69s3vwl1p5h9r2agh0aw30qw50jvkkw"; + rev = "419279ec95260efe3af42c8b03b823e59f09c3bc"; + sha256 = "1cydvb4jbh8h1n09rc8446fspvfvbgbqz5a21nbadbkg3106wn3c"; }; }; @@ -1487,24 +1498,24 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-12-20"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "55120b28e4f8aa1da6b5677ebd627a5f5557a9c7"; - sha256 = "1q4645ayqyi82j0pbak6i8r6pkq553yr67rd21x22rghwg6h37la"; + rev = "2572136fcb4c9941553dd05504007806613c8946"; + sha256 = "08fdaxaldbmg76bkj0xni4cpgqiss4cdxnv3jxskwvs6v9dxmbcs"; fetchSubmodules = true; }; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; - version = "2019-06-17"; + version = "2019-12-31"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "bf7ca0927c82edc495f7fa67bebc58e92567aa20"; - sha256 = "1ikpbg8whabfir6xpb6z4hs8ay3rg9q2qw45sn1ggfikp7dxfwbx"; + rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac"; + sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm"; }; }; @@ -1631,12 +1642,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-12-13"; + version = "2019-12-29"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "12388bb5ce5f5a16dc55dc22b80d7a410410b479"; - sha256 = "1k7l8sq6jcl0a6yk68ch72w20rhwi26fhrp0yvvvim0krs0yr068"; + rev = "6e60e3a6575449e08feb27fb3528b55e71fd56e3"; + sha256 = "054wxj8f23ddqs3mp8rvw2lsplqfyn352zcq6biywbybjm2xphf7"; }; }; @@ -1653,12 +1664,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-12-20"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "6fb3ddd293cbd0614f6ed5e637a059c72de643f7"; - sha256 = "1c0dsxqj5f3i2i3k6q7m1b2xlxz9mizmchydw1mz7s3rd0vs06sq"; + rev = "f4fa096a67afbe593bd53cf618850c32512b5d47"; + sha256 = "0qrz4nwb4imnxiqk3p1r4sxib1gjicpsr3g6l8mdgw806l1jc9mg"; }; }; @@ -1862,12 +1873,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-12-01"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b4f7ad5ebb759f56c598527ab671aecace114ed5"; - sha256 = "0xq0vxq86am6xj4sxsnj131d54fds532pikabzsz2l8gnikb4b2r"; + rev = "b7ccdb2a7f9d20a1bbb6a5e4774104eb06969bb9"; + sha256 = "136qg04z92dnrgbwbjlc06qcd656sc004hznxdaic3pyq3lh25z4"; }; }; @@ -1917,12 +1928,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-12-12"; + version = "2019-12-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "84057dd1dd28e1198d0b2777301ef6cafd8f2cef"; - sha256 = "164077vmqf4kcj0kn5c027faa4fjzfdbl1cz4j45dxpbak36hy6w"; + rev = "6cccbd41851f3d8f47c5e225d552a217cede4f3f"; + sha256 = "0jrdya11fzis746x1s802g2w20v47dhaxlmczb2fv4x3fxfwql5p"; }; }; @@ -1983,23 +1994,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-12-21"; + version = "2019-12-30"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "ce590719f67ec031f75935bdbfe0c9616ea878b9"; - sha256 = "09q72ddypwh8mpg467nl6z16mvs29gxhwlmm3npn0817c6sf9dqb"; + rev = "24df32304e20677ab061115e7bc8a37f382c60e9"; + sha256 = "00w46597m8xsdksm2smqmslxk6ydnig4ycwn4fn0ybrlmyalclhi"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-12-16"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "1ab85e33bef8763a618c505ee5a0611519f81e5a"; - sha256 = "1fxbl06pqm1zay0lbg9q6qq21rbcbpmbn53kfw86qyqj71rayd01"; + rev = "8a14891241e3468f9c13deaa6cf88aebe53b519f"; + sha256 = "033qnzna0awys5w5wf9sj2gydm433l1919zz9cm984l0nmgmkp29"; }; }; @@ -2071,12 +2082,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2019-12-22"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "842c4413c1e6585960db503080c8ac663dba9440"; - sha256 = "0nbbsq8y51c15wh29c3ia6lk6ahr8r281r5069x56v478n8p82h8"; + rev = "7a15a52c0a7d735625ac73dc4d8efe70c5e99707"; + sha256 = "1wpp54gvb90qhgnxmp3fvfc3dbkdxk3q712c7wyd9alpbk4608fk"; }; }; @@ -2346,12 +2357,12 @@ let readline-vim = buildVimPluginFrom2Nix { pname = "readline-vim"; - version = "2019-12-12"; + version = "2019-12-28"; src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "9711f3c7c1d295e775750d7421060d74ee1b56e3"; - sha256 = "0zvavhc8033isdn7gdfla5kwif40rkn9p4zmkvwy423dpb3432h2"; + rev = "48f04c651728e8a7a8352eec697801aa32348564"; + sha256 = "1vs91lkm9gwvp0bahx80ag6lw03r5x6kyih70l4sq8q0kydp5f13"; }; }; @@ -2522,12 +2533,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2019-10-09"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "ed1e2b20a6c2c4945b529799f2cdb0409f6a10d2"; - sha256 = "0yl82pp23nfg4ckrq33a3flisp7all6gs3aza7z9swv966y1qhwx"; + rev = "c09ffbbf54b4c25996f864b0f75ebc7a1fca6919"; + sha256 = "1sn952wil99jqc3r9hr017604s6gb99jwwmbldmkdh9qcr03kjvm"; }; }; @@ -2566,12 +2577,12 @@ let splice-vim = buildVimPluginFrom2Nix { pname = "splice-vim"; - version = "2017-09-03"; + version = "2019-12-23"; src = fetchFromGitHub { owner = "sjl"; repo = "splice.vim"; - rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; - sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; + rev = "fb0d7052e5569f59cb94f0e4303307affdd0e271"; + sha256 = "1vxxlh88dxmrsfr8w87395h84hgflcgaj6s35vjg34464xzsdn8s"; }; }; @@ -2676,12 +2687,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2019-12-22"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "ce30e3f0d1d2ceaad44a2e3550738b6bc71628a1"; - sha256 = "1sx3jnb7zifjhrg27kfh0q7r038yy3qlyf778hrkfpcqfmrki992"; + rev = "3753b235a1163cfbc3b7c417825d1910b2f66100"; + sha256 = "16nw145n17d9fnwhcp42k85sf2mx2nyp7wy4gllhw48xnwgh6qpb"; }; }; @@ -2709,12 +2720,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2019-08-11"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "c9cecefc639b6019e0f12b7e9fb5a2375cd550c1"; - sha256 = "0xb61wchvj1iqzwxzscv3zwbsx1qjh8qhkmijsrjz92566g12xhy"; + rev = "239c0c08d3e691a2c447278b88de91b602fa50bd"; + sha256 = "1v2v6zp59mblz7dj5fad640qsz92dgjsb2qzir42df2h86qx0zwa"; }; }; @@ -2842,12 +2853,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2019-12-19"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "c4bb89495a2af3ed41a510db9a2f589748643801"; - sha256 = "0xwcx35aj32h99l5gb8qb4xvddpcndim998p0vrirzj0mi08avlx"; + rev = "96026a4df27899b9e4029dd3b2977ad2ed819caf"; + sha256 = "1lp6rggsdq7hhis02yyzb79y30g3f7zcydwsi0hjpnnrwvani6s3"; }; }; @@ -2930,12 +2941,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-12-19"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "a6f90e5691d8b80db024d8298b3fb461752e0248"; - sha256 = "1g19lgjlqcyvs5x120sv5iwnggjyfzyl1k9w4b39yhhfmqi1vvf9"; + rev = "5a633625615c79f87786d74ea925790ccdd82aba"; + sha256 = "0ng2qnwccpbqkhqilm7nj61217rvczxfcgkhdsxj3h2v4fj5ryy5"; }; }; @@ -3161,23 +3172,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-12-19"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b93492b40b068d4bb3020c123295061aaba7c846"; - sha256 = "12nb31ca6w3wv7b5sq7msasm39mjcxd3ii8r94y18lhxz223dgzj"; + rev = "66f77d4a77e54946fedaac7d54d02271751eab40"; + sha256 = "008k8v0nx219lbn0vsc1cwr537lg0gdb9s4d7hjpdq2rhh79zsg3"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-12-19"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "945bc057d1e96c99834f1beee6c9f03f0d430b97"; - sha256 = "0v6q71hyd4pn46636xb9crlydjds05dvrq0idwjxb62146j83m32"; + rev = "14c3a60ab0f42aa1001d8f32ffaab2c28935a1e7"; + sha256 = "0k25x599sfaw931p5b83cpqhz5dzjxp01v3qlsi78rhjyw1y83jf"; }; }; @@ -3348,12 +3359,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-11-20"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "dae6dd82a98eda68af83a1f725cc570ef3b1ae7d"; - sha256 = "0w2djjs29dgd5jcfglvgb4mb60vb1bj34mxzbx2sidp3lb15xn4y"; + rev = "7556c68b1d68b9a2b1b4a9df838cdc4bcf87ba0a"; + sha256 = "0bi6nbma0bwzvn7l6w88qgr4fbpfbipv936z346sh59dk17j4nv6"; }; }; @@ -3579,12 +3590,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2019-03-23"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "85e90c9759e14633d878ed534ef313876ab96555"; - sha256 = "1n5rlqh685ba96mwi407x3r7vlxd34awlyb2wjmz6j8m0ld3skrq"; + rev = "83a09a19e7a9c51c6ca2e0f90f1dd27ef4c159c6"; + sha256 = "1xaliyiv80vcsl5gqj40avgdf4384d5xhnvhh0jaklk1hmrdzxgf"; }; }; @@ -3777,12 +3788,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-12-11"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b68b6d4329d9bee58a521e0ff8c6adbbc53915b4"; - sha256 = "1lrx2vk6bj10sy297mby4fqjrn09s7ghq2xjbp8z2ajww4pcxp05"; + rev = "ddd64fc4c5c5365d56478f100f19898375244890"; + sha256 = "1b6mw8bb8dc46vjz5qb2v0n5kfvwz4hk7q0frflrsyc6z3pw7hab"; }; }; @@ -3799,12 +3810,12 @@ let vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; - version = "2017-02-20"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; + rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; + sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; }; }; @@ -3854,12 +3865,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-12-18"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b1b9a1b0d4e9b2408b29ed566135f56ec27629b9"; - sha256 = "1m4ldfc7k5ds8z4bjl8dpx63dx7d4b75ifkpjxz8l9rq6ix8i4y8"; + rev = "ee2071d8e63f9aab98d750a91fcc3358e9987bc9"; + sha256 = "0a2ac5y8x3lhry5dzq2jbzvryfbvrdvn7bkd2wwm5bf2y9zpkbwk"; }; }; @@ -4339,12 +4350,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-12-17"; + version = "2019-12-30"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "0fd38b8a93ab16d380aed8467a5059e5b3932a2e"; - sha256 = "06jz7f5npwm2iknpfmzz5x8lw5377hzc5kpg6n5p2icjwzaha6mz"; + rev = "6cb8410e10f1b6a23adf238c1f93ce19a3eef83a"; + sha256 = "1zqv58s35qvp53an15mvs7ywvarsqxc0has6yji99jwmjiq68pag"; }; }; @@ -4680,12 +4691,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-12-11"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "359ce90b9b37442974fd3ccd9279493d85efb3af"; - sha256 = "1dbdnyfzhfgn70jgcd0a079b76s4gdv9ykslmfiaiv7bvlmhs08s"; + rev = "2f5f74e5e67f657e9fdac54891a76721bcd3ead3"; + sha256 = "08772rc8wqpbxwqqkl8v9x79sijkdigypqlr12ph7jc45qfdqblp"; }; }; @@ -4702,12 +4713,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-12-12"; + version = "2019-12-31"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "cea0d08a062478503814e51aa21c6486a0dd1b21"; - sha256 = "05vhwgq2kj3safjhnv0rl4fhcfszba02mbwnyrlq4ayyiyv3n7cc"; + rev = "e8454d66ab8376cf9c7e42f09749d5bd17d98f89"; + sha256 = "19hajmja01hrzmq6f0lfnc03d7zpk0ixa9h9j5giskxp151f7vjr"; }; }; @@ -4900,12 +4911,12 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2019-11-13"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "76f62675a1814abcfbacb296f60dbb2d9d2b2f5f"; - sha256 = "05fmzd368d0mn141a1awhybl19bgls5j8czmyyvygx5pawjl3s6f"; + rev = "86f49aca266e4b17420bcadd29009997d15668d8"; + sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c"; }; }; @@ -5010,12 +5021,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-11-06"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "24e6c3f4cd6004e2b44e4022dee0260aba6132aa"; - sha256 = "000i2x36b8l5vc1li0f4jazs06nch9pca95yqr4w4m5hgjpzs5qs"; + rev = "7afd63b4552b0827622ae27ff4c9eca056dd3521"; + sha256 = "0g9vsxbrsfcc0n7rq9m0331rcjyv35z0yc0d2cwkg939bzqw75qx"; }; }; @@ -5032,12 +5043,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-12-19"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "180d239935a2cb496c7b702d9fbe38f05fe3dea2"; - sha256 = "0gz8yk87c0v0vaamy2nz7flrklzb00867nm7vcmyfpamha4wkib4"; + rev = "f324a43a5f6a941a55ee992bb852f3c2c504a509"; + sha256 = "0dgxsn96vw4zgci58lzr4d4d4kwjbk9d52h51ibh3mhsikmpr7xk"; }; }; @@ -5197,12 +5208,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-12-16"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "bff65bf59401ef7d165637aedafe72f212ddf4c7"; - sha256 = "1jgzir5qn9v0ws6yb6d0hc3p859gy81x22wkqk58w55xxmfxd7am"; + rev = "1df8ac3e1bc33e1c70bd3a1713d8c9cd2eb491e1"; + sha256 = "0ivkm9vzzfn1iwzkkgk54kn846qnhvsaf8f4nzz3mllirjsl14am"; }; }; @@ -5274,12 +5285,12 @@ let vim-textobj-variable-segment = buildVimPluginFrom2Nix { pname = "vim-textobj-variable-segment"; - version = "2019-05-05"; + version = "2019-12-30"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "1af9cdef58a4072dddbe926e7c8c53903e97b70a"; - sha256 = "0spfbc30sli7ckpfbmjspfrbcg9dq5k0aimzbxx06rimbba8f846"; + rev = "78457d4322b44bf89730e708b62b69df48c39aa3"; + sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj"; }; }; @@ -5626,12 +5637,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-12-15"; + version = "2019-12-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7c08bf73aa15bc794c79b1e8750df3c18066c6fb"; - sha256 = "130x4nwp2wci67nf7v73r4b7xgmfgs18ls1ckyrsq54k16016dbz"; + rev = "020206fbe1f6981855a3fe2f96ef893db782d4b8"; + sha256 = "113d1zdmx3vhjig4xrp1kqlzapdhygis2ky2paww42j22vakqywc"; }; }; @@ -5648,12 +5659,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-08-08"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "57d23fa763b498561aca7eb4efb05b52efd120c9"; - sha256 = "034857pz36rps7jmg79brcb25vfb4dgqpdhfy24vyhn3nil46jxs"; + rev = "b90e6f2e3343277faca65156d733f725f76f1e53"; + sha256 = "1z3mj73iqh4h3wx5cq4k7gp2nkbaj85v665v0phqw42c213064nb"; }; }; @@ -5769,24 +5780,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-11-30"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "e9d8813c02b8bdb81b63aeb576b9eaadf0dd4445"; - sha256 = "1x5950ca4nmsf1129sjd12kcncpv8jf4x80s0y3gwwgr3p7x1m22"; + rev = "48184a10ecdda3efce0131aa73495f1edc449a33"; + sha256 = "0nsdq17r2m2pmnz077rliqdlwk5sn1aj3bxl648bsli7rjacgaqq"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-12-18"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "9e2ab00bd54cf41787079bcc22e8d67ce9b27ec2"; - sha256 = "0fnir9hlpmh4k8cg79lcir51aydrsfnwn9w9nnxa4yi8qnvc0pgs"; + rev = "d9a9ce47de8b88100e4230805bf44d394197476d"; + sha256 = "1ggr6dhppmc34wah8d6dwjfb9kkaazlxajvnd972pyx9c56crl89"; fetchSubmodules = true; }; }; @@ -5826,12 +5837,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-12-10"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "65f71de21c31a0b7f7b09a62f865d1b61f9f71ed"; - sha256 = "0y0rfpsggl1a1h89zjzgpnx3vj244gmr3qwblsclh3hzf0sdav5r"; + rev = "7b644a313bf3e32a3b0c4616660d61f5ec8872d9"; + sha256 = "1icv1qa4wf1kaknfs045m8md2938qggzl6a5wf76lcn1iw5nr1cc"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a885dc163a1..6cde4d6695a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -17,12 +17,15 @@ # deoplete-khard dependency , khard -# vim-go denpencies +# vim-go dependencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, gometalinter , impl, iferr, gocode, gocode-gomod, go-tools +# direnv-vim dependencies +, direnv + # vCoolor dependency , gnome3 }: @@ -100,6 +103,14 @@ self: super: { ''; }); + direnv-vim = super.direnv-vim.overrideAttrs(oa: { + preFixup = oa.preFixup or "" + '' + substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ + --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ + "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" + ''; + }); + clighter8 = super.clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ @@ -118,12 +129,12 @@ self: super: { # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "2019-11-30"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "42a45c639e2c43f9f1795c3804787c6a686781c0"; - sha256 = "0bny7s7scbls01jkvrwcd516py09lp0vkr65p1ik4282blyxyy6s"; + rev = "984779f2f825626aa9d441746d8b4ee079137c65"; + sha256 = "0w7qnhi7wikr789h3w5p59l8wd81czpvbzbdanf8klf9ap4ma3yg"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c0768f02851..93e8f50e3d5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -47,6 +47,7 @@ chriskempson/base16-vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator ckarnell/antonys-macro-repeater +ckipp01/coc-metals cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index d1b1bc846eb..16c14b32218 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,8 +188,7 @@ let vam ? null, pathogen ? null, plug ? null, - customRC ? "", - beforePlugins ? "", + customRC ? "" }: let @@ -209,6 +208,8 @@ let '' let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" execute pathogen#infect('${pluginsEnv}/{}') + + filetype indent plugin on | syn on ''); /* vim-plug is an extremely popular vim plugin manager. @@ -260,6 +261,8 @@ let in assert builtins.hasAttr "vim-addon-manager" knownPlugins; '' + filetype indent plugin on | syn on + let g:nix_plugin_locations = {} ${lib.concatMapStrings (plugin: '' let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" @@ -330,29 +333,19 @@ let set packpath-=~/.vim/after set packpath+=${packDir packages} set packpath+=~/.vim/after - ''); - - # somebody else could provide these implementations - vundleImpl = ""; - - neobundleImpl = ""; + filetype indent plugin on | syn on + ''); in writeText "vimrc" '' - " minimal setup, generated by NIX + " configuration generated by NIX set nocompatible - ${beforePlugins} - ${vamImpl} ${pathogenImpl} ${plugImpl} - ${vundleImpl} - ${neobundleImpl} ${nativeImpl} - filetype indent plugin on | syn on - ${customRC} ''; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 22e97cd4d88..b4ec1d2d696 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -140,6 +140,29 @@ in }; }; + scala-lang.scala = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "scala"; + publisher = "scala-lang"; + version = "0.3.8"; + sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + scalameta.metals = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "metals"; + publisher = "scalameta"; + version = "1.6.3"; + sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7"; + }; + meta = { + license = stdenv.lib.licenses.asl20; + }; + }; skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { |