diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors')
63 files changed, 3911 insertions, 3389 deletions
diff --git a/nixpkgs/pkgs/applications/editors/atom/default.nix b/nixpkgs/pkgs/applications/editors/atom/default.nix deleted file mode 100644 index 29c4bb6c884c..000000000000 --- a/nixpkgs/pkgs/applications/editors/atom/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: - -let - versions = { - atom = { - version = "1.60.0"; - sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY="; - }; - - atom-beta = { - version = "1.61.0"; - beta = 0; - sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY="; - broken = true; - }; - }; - - common = pname: {version, sha256, beta ? null, broken ? false}: - let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; - name = "${pname}-${fullVersion}"; - in stdenv.mkDerivation { - inherit name; - version = fullVersion; - - src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; - name = "${name}.deb"; - inherit sha256; - }; - - nativeBuildInputs = [ - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system - ]; - - buildInputs = [ - gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - ar p $src data.tar.xz | tar xJ ./usr/ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/bin usr/share $out - rm -rf $out/share/lintian - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - # needed for gio executable to be able to delete files - --prefix "PATH" : "${glib.bin}/bin" - ) - ''; - - postFixup = '' - share=$out/share/${pname} - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$share" \ - $share/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}" \ - $share/resources/app/apm/bin/node - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux - - dugite=$share/resources/app.asar.unpacked/node_modules/dugite - rm -f $dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $dugite/git/bin/git - rm -f $dugite/git/libexec/git-core/git - ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git - - find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; - - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop - ''; - - meta = with lib; { - description = "A hackable text editor for the 21st Century"; - homepage = "https://atom.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ offline ysndr ]; - platforms = platforms.x86_64; - inherit broken; - }; - }; -in lib.mapAttrs common versions diff --git a/nixpkgs/pkgs/applications/editors/atom/env.nix b/nixpkgs/pkgs/applications/editors/atom/env.nix deleted file mode 100644 index a5ca5775aae3..000000000000 --- a/nixpkgs/pkgs/applications/editors/atom/env.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu, libdrm, mesa -}: - -let - packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu - libdrm - mesa # required for libgbm - ]; - - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - -in { inherit packages libPath; } diff --git a/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/nixpkgs/pkgs/applications/editors/bluefish/default.nix index 008ff8196d16..6a5d3cbd1f6a 100644 --- a/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, intltool , wrapGAppsHook , pkg-config , gtk @@ -14,14 +13,14 @@ stdenv.mkDerivation rec { pname = "bluefish"; - version = "2.2.12"; + version = "2.2.14"; src = fetchurl { url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; - sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; + sha256 = "sha256-IszfnOTlyWIQY+bPfXOr+wc2q3pyvOCG0Gxc9e4SXt4="; }; - nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme gtk diff --git a/nixpkgs/pkgs/applications/editors/bviplus/default.nix b/nixpkgs/pkgs/applications/editors/bviplus/default.nix index f56fe637f83f..1cffe049c73d 100644 --- a/nixpkgs/pkgs/applications/editors/bviplus/default.nix +++ b/nixpkgs/pkgs/applications/editors/bviplus/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/nixpkgs/pkgs/applications/editors/cudatext/default.nix index 5574a7fff602..9eed461413a6 100644 --- a/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.199.0"; + version = "1.200.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-07IXz2xhnAJFq4YbxjY6EjWiS5MCgylDphYUDk7ILfM="; + hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 4ebc1017d42f..52a333495ef6 100644 --- a/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.09.07", - "hash": "sha256-/ebjEOnmMH9pj8EZfyGP98fzBvSJepLTJGqK6xWoQWc=" + "rev": "2023.10.02", + "hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.09.18", - "hash": "sha256-JwZ9abeodtPqzZZ8NlAEZQLgb81DB2NPBcbBphwhpb0=" + "rev": "2023.10.03", + "hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -31,13 +31,13 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ=" + "rev": "2023.10.02", + "hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2023.05.15", - "hash": "sha256-8dWitKZB4nLcJ3fIN40jfNnyAGcRPLfA0iKNZ0zWFWo=" + "rev": "2023.06.29", + "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" }, "Emmet-Pascal": { "owner": "Alexey-T", diff --git a/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 686ec3681183..b9bd9c0b9634 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -6,19 +6,18 @@ , callPackage }: -# https://download.eclipse.org/eclipse/downloads/ is the main place to -# find the downloads needed for new versions +# use ./update.sh to help with updating for each quarterly release # -# to test: +# then, to test: # for e in cpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done let platform_major = "4"; - platform_minor = "27"; + platform_minor = "29"; year = "2023"; - month = "03"; #release month - buildmonth = "03"; #sometimes differs from release month - timestamp = "${year}${buildmonth}020300"; + month = "09"; #release month + buildmonth = "09"; #sometimes differs from release month + timestamp = "${year}${buildmonth}031000"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -44,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-MBng3ETarHMlUUPpVvMIZxVqpe9JW5xNHonnN6CHRcw="; - aarch64 = "sha256-7FgpPzp5MY/fB6Q/wvrvi+Lpcm3tmH7bUTLh7q2Rjek="; + x86_64 = "sha256-r9ZDt1D7Wt0Gp2JvW4Qwkw0Rj8F4IhUiNpVgm8FDdbY="; + aarch64 = "sha256-fyIvDY9jQfLwwNL4iaLb80X2eWaYqkLqtMd09yOQGo4="; }.${arch}; }; }; @@ -59,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-BXofrKElgCG3+WUCanpX1sGLhirj2pLi+pi24Z+WjBk="; - aarch64 = "sha256-CdePRa6jmWlt3Wismt3RahGzYOm1ZDwQRt82kRVXSdM="; + x86_64 = "sha256-eO+fnoN0jZCURwmy6M0Okb9U4R3z8u1gzfm2mGp+Chc="; + aarch64 = "sha256-gN0wu7QOyVslvWum9SIkptADtQoX47UPentEupJBnQ8="; }.${arch}; }; }; @@ -74,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-aprXjNv2NMoIDCNkFxwmMKcGUt2ssRonzTZ/hH57Mig="; - aarch64 = "sha256-Aq9PDVo/9zTeQ2j6q5bf1aIKjKM7oonIr1mEQ7rX48Y="; + x86_64 = "sha256-+0yzlB89v8KrhDfo5oqT0NKY/3hPk+Pkp2yGQ0silEg="; + aarch64 = "sha256-CvzDldzcmLzL7z9ZRxHQblmvkzza4wQYeDIZf6V6uXk="; }.${arch}; }; }; @@ -106,8 +105,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-39DXU7wIsdxkUpNKnYPT7+qPJ2DrF7G7UJqPfhEDGGs="; - aarch64 = "sha256-7GwKGNHWPZ3uOFyzQj1dftFFz/3oa2j8XWkRn0wnllY="; + x86_64 = "sha256-Qp9yKSNWVPH8SX1D4PMfSv3XqiKAQCVXWFcSyQaMFmA="; + aarch64 = "sha256-cp8/BiewoNt4txhHmpiBTSXZ2sXXPu6zxuAYi24DF9I="; }.${arch}; }; }; @@ -121,8 +120,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-zNBzFHmNaxUutzMh/5pOglJiKh5NAvSVwvPYyA6RVr4="; - aarch64 = "sha256-RtLXB9kgpLERfhpvDTaJG84qVyN1Puud1PTZtk/WIO0="; + x86_64 = "sha256-TX8LbbBxRGWJ7lmf3tfK+Eux54dSapCsP7OmLfDw4Do="; + aarch64 = "sha256-AltrVmCuSTAoRgVsw98oNiR1HPpbYovz3UNGRXQgiVs="; }.${arch}; }; }; @@ -136,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-vpvmKZKVl6ubfq8QMDr0xprXYMWl576hu+ovvREN4ak="; - aarch64 = "sha256-5Yqxgl4kkN3Bb7hsTnd9q5TsCpVBVkEVvqPbL5MYEyg="; + x86_64 = "sha256-kMEeY27Q97+5/pbl3of93p43dMXE1NQmuESCsK5sK3g="; + aarch64 = "sha256-sf+l/BjJ1VAyrc94oJUKYEInG7wEivbYEhpEXLi4C+w="; }.${arch}; }; }; @@ -151,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-4SAiEZWSUaiK8QO2Hg39FBcj1aYRtbOJkeF1W1AMQBo="; - aarch64 = "sha256-+KGDlo6QK3o/n2vSiD0HpIkBwqwIiMXzdFUpfE48gps="; + x86_64 = "sha256-K9+Up4nDXZCBKxzj2LX7F9ioPocHnxPdpHMQuc5oehs="; + aarch64 = "sha256-ibB3D+0UuX2c+Cbr0L5r8Rh6BfpmOyXNnSk13m2Q7Zk="; }.${arch}; }; }; @@ -166,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-bhcpzsS9cci3Y3Pk9DOrtPonKjRg/vzDqDr3Be/xfks="; - aarch64 = "sha256-YCb4leFWRtx4VPwK/5vgwwDH3/f0/0OWEy4ueAS7sUw="; + x86_64 = "sha256-J+8UbkDiG9F+mDBZwr4HVGJWqeSBGMsl3EIRtA7+fK0="; + aarch64 = "sha256-+oYY37fBjEi2GJCZVaCsUyWwAhsPPD6nAstUDGmywwo="; }.${arch}; }; }; diff --git a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index a8a248804b04..ca736f80e758 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://github.com/eclipse-cdt/cdt/releases - version = "11.1.1"; + version = "11.3.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-k78QKPIb3Lr0Wcg2tTlX1abdpcvxspjaxJiP2Hrgb4A="; + hash = "sha256-jmHiIohn8Ol0QhTCOVRStIAKmMzOPcQ5i5QNz6hKQ4M="; }; meta = with lib; { @@ -355,7 +355,7 @@ rec { src = fetchzip { url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; - sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; + hash = "sha512-dWTS72R2VRgGnG6JafMwZ+wd+1e13pil0SAz2HDMXUmtgYa9iLLtma3SjcDJeWdOoblzWHRu7Ihblx3+Ogb2sQ=="; postFetch = '' # update site is a couple levels deep, alongside some other irrelevant stuff cd $out; diff --git a/nixpkgs/pkgs/applications/editors/eclipse/update.sh b/nixpkgs/pkgs/applications/editors/eclipse/update.sh new file mode 100755 index 000000000000..7e100ccfbcd7 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/eclipse/update.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq +#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz +# ^ +# | +# nixos-unstable ~ 2023-07-06 -----------------/ + +set -o errexit +set -o nounset + +# scrape the downloads page for release info + +curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/ +trap "rm eclipse-dl.html" EXIT + +dlquery() { + q=$1 + xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}"; +} + +# extract release info from download page HTML + +platform_major=$(dlquery '."#text" | split(".") | .[0]' -r); +platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r); + +year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]') +buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]') +builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]') +timestamp="${year}${buildmonth}${builddaytime}"; + +# account for possible release-month vs. build-month mismatches + +month=$buildmonth; +case "$buildmonth" in + '02'|'04') month='03' ;; + '05'|'07') month='06' ;; + '08'|'10') month='09' ;; + '11'|'01') month='12' ;; +esac + +cat <<EOF + +paste the following into the 'let' block near the top of pkgs/applications/editors/eclipse/default.nix: + + platform_major = "${platform_major}"; + platform_minor = "${platform_minor}"; + year = "${year}"; + month = "${month}"; #release month + buildmonth = "${buildmonth}"; #sometimes differs from release month + timestamp = "\${year}\${buildmonth}${builddaytime}"; +EOF + +# strip existing download hashes + +sed -i 's/64 = ".*";$/64 = "";/g' pkgs/applications/editors/eclipse/default.nix + +# prefetch new download hashes + +echo; +echo "paste the following url + hash blocks into pkgs/applications/editors/eclipse/default.nix:"; + +for u in $(grep 'url = ' pkgs/applications/editors/eclipse/default.nix | grep arch | cut -d '"' -f 2 | sed 's/&/\\&/g'); do + echo; + echo " url = \"${u}\";"; + echo " hash = {"; + for arch in x86_64 aarch64; do + us=$(eval echo "$u"); + h=$(nix store prefetch-file --json "$us" | jq -r .hash); + echo " $arch = \"${h}\";"; + done + echo ' }.${arch};'; +done diff --git a/nixpkgs/pkgs/applications/editors/gedit/default.nix b/nixpkgs/pkgs/applications/editors/gedit/default.nix index 4352b74f964d..a7f1fd135fd6 100644 --- a/nixpkgs/pkgs/applications/editors/gedit/default.nix +++ b/nixpkgs/pkgs/applications/editors/gedit/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , meson +, mesonEmulatorHook , fetchurl , python3 , pkg-config @@ -58,6 +59,8 @@ stdenv.mkDerivation rec { gtk-doc gobject-introspection docbook-xsl-nons + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/glow/default.nix b/nixpkgs/pkgs/applications/editors/glow/default.nix index cbd63c0ffcd0..79e871561c07 100644 --- a/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -1,24 +1,43 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles +, stdenv +, fetchpatch }: + buildGoModule rec { pname = "glow"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "sha256-CI0S9XJtJQClpQvI6iSb5rcHafEUwr2V6+Fq560lRfM="; + hash = "sha256-12UziCf3BO1z+W02slNCCvXhIkvZuVgXk++BdHG3gDI="; }; - vendorHash = "sha256-2QrHBbhJ04r/vPK2m8J2KZSFrREDCc18tlKd7evghBc="; + vendorHash = "sha256-xxFC87t12bZKea9Snscul+xx8IGFAcoIr9Z8wxHL7nM="; + + # Remove whenever a release with it is available + patches = [(fetchpatch { + url = "https://github.com/charmbracelet/glow/commit/f0734709f0be19a34e648caaf63340938a50caa2.patch"; + name = "go-1-17-patch"; + hash = "sha256-vpMiVb/7SFT9xcSpVGQriEjkexh1F/ljpfpIswdBx2Y="; + })]; doCheck = false; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd glow \ + --bash <($out/bin/glow completion bash) \ + --fish <($out/bin/glow completion fish) \ + --zsh <($out/bin/glow completion zsh) + ''; + meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; diff --git a/nixpkgs/pkgs/applications/editors/hexcurse/default.nix b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix index 715693770c55..1c2e09695e5e 100644 --- a/nixpkgs/pkgs/applications/editors/hexcurse/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/editors/hexdino/default.nix b/nixpkgs/pkgs/applications/editors/hexdino/default.nix index cc3b39ed4bf7..5eb023f8b9ed 100644 --- a/nixpkgs/pkgs/applications/editors/hexdino/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexdino/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexdino"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "Luz"; repo = pname; rev = version; - sha256 = "sha256-OFtOa6StpOuLgkULnY5MlqDcSTEiMxogowHIBEiGr4E="; + hash = "sha256-glbyftCJiP0/5trW7DOcVCU2q4ZH3zFK96eyGuYR8eY="; }; - cargoSha256 = "sha256-lvLiRQNH3rpu+JTXWhQtXczmGRWGtnnLDknZaMp3d0s="; + cargoHash = "sha256-nldA8gDMj0iO+HgatiuMqzR6ZCjbxFsTp5pDGbFKA1k="; meta = with lib; { description = "A hex editor with vim like keybindings written in Rust"; diff --git a/nixpkgs/pkgs/applications/editors/ht/default.nix b/nixpkgs/pkgs/applications/editors/ht/default.nix index 42b3f1495a31..c8a13738c910 100644 --- a/nixpkgs/pkgs/applications/editors/ht/default.nix +++ b/nixpkgs/pkgs/applications/editors/ht/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/editors/imhex/default.nix b/nixpkgs/pkgs/applications/editors/imhex/default.nix deleted file mode 100644 index 528723878efd..000000000000 --- a/nixpkgs/pkgs/applications/editors/imhex/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, cmake -, llvm -, fetchFromGitHub -, mbedtls -, gtk3 -, pkg-config -, capstone -, dbus -, libGLU -, glfw3 -, file -, perl -, python3 -, jansson -, curl -, fmt_8 -, nlohmann_json -, yara -, rsync -}: - -let - version = "1.30.1"; - - patterns_src = fetchFromGitHub { - owner = "WerWolv"; - repo = "ImHex-Patterns"; - rev = "ImHex-v${version}"; - hash = "sha256-lTTXu9RxoD582lXWI789gNcWvJmxmBIlBRIiyY3DseM="; - }; - -in -stdenv.mkDerivation rec { - pname = "imhex"; - inherit version; - - src = fetchFromGitHub { - fetchSubmodules = true; - owner = "WerWolv"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3s9Dgdhl+k2KjMoSHNl59YOoCEwqK+37DOzKdGP88/4="; - }; - - nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ]; - - buildInputs = [ - capstone - curl - dbus - file - fmt_8 - glfw3 - gtk3 - jansson - libGLU - mbedtls - nlohmann_json - yara - ]; - - cmakeFlags = [ - "-DIMHEX_OFFLINE_BUILD=ON" - "-DUSE_SYSTEM_CAPSTONE=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_FMT=ON" - "-DUSE_SYSTEM_LLVM=ON" - "-DUSE_SYSTEM_NLOHMANN_JSON=ON" - "-DUSE_SYSTEM_YARA=ON" - ]; - - # rsync is used here so we can not copy the _schema.json files - postInstall = '' - mkdir -p $out/share/imhex - rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,patterns} $out/share/imhex - ''; - - meta = with lib; { - description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; - homepage = "https://github.com/WerWolv/ImHex"; - license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ luis kashw2 ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix b/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix index bd14cf2ffdad..747f03f55d5e 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { runHook preInstall APP_DIR="$out/Applications/${product}.app" mkdir -p "$APP_DIR" - cp -Tr "${product}.app" "$APP_DIR" + cp -Tr *.app "$APP_DIR" mkdir -p "$out/bin" cat << EOF > "$out/bin/${loname}" open -na '$APP_DIR' --args "\$@" diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 07372413b73c..720718cb7bb7 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -7,7 +7,6 @@ , gdb , zlib , python3 -, icu , lldb , dotnet-sdk_7 , maven @@ -17,18 +16,20 @@ , openssl , expat , libxcrypt-legacy +, fontconfig +, libxml2 +, xz , vmopts ? null }: let platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; - ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; + ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" "aarch64-linux" ]; inherit (stdenv.hostPlatform) system; versions = builtins.fromJSON (lib.readFile (./versions.json)); - versionKey = if stdenv.isLinux then "linux" else system; - products = versions.${versionKey} or (throw "Unsupported system: ${system}"); + products = versions.${system} or (throw "Unsupported system: ${system}"); package = if stdenv.isDarwin then ./darwin.nix else ./linux.nix; mkJetBrainsProduct = callPackage package { inherit vmopts; }; @@ -59,6 +60,9 @@ let openssl.out expat libxcrypt-legacy + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + libxml2 + xz ]; dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' @@ -66,12 +70,12 @@ let cd $out/clion # I think the included gdb has a couple of patches, so we patch it instead of replacing - ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so - ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -124,7 +128,7 @@ let server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client. ''; - maintainers = with maintainers; [ kouyk ]; + maintainers = with maintainers; [ ]; }; }); @@ -252,8 +256,6 @@ let (mkJetBrainsProduct { inherit pname version src wmClass jdk buildNumber; product = "Rider"; - # icu is required by Rider.Backend - extraLdPath = [ icu ]; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; inherit description license platforms; @@ -268,15 +270,31 @@ let maintainers = with maintainers; [ raphaelr ]; }; }).overrideAttrs (attrs: { - postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp \ - lib/ReSharperHost/linux-x64/Rider.Backend \ - plugins/dotCommon/DotFiles/linux-x64/JetBrains.Profiler.PdbServer - - rm -rf lib/ReSharperHost/linux-x64/dotnet - ln -s ${dotnet-sdk_7} lib/ReSharperHost/linux-x64/dotnet - ''); + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ + autoPatchelfHook + ]; + buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ + stdenv.cc.cc + zlib + fontconfig # plugins/dotTrace/DotFiles/linux-*/libSkiaSharp.so + ]; + dontAutoPatchelf = true; + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/rider + + # Remove dotnet copy first so it's not considered by autoPatchElf + rm -rf lib/ReSharperHost/linux-*/dotnet + autoPatchelf \ + lib/ReSharperHost/linux-*/ \ + plugins/dotCommon/DotFiles/linux-*/ \ + plugins/dotTrace/DotFiles/linux-*/ + + for dir in lib/ReSharperHost/linux-*; do + ln -s ${dotnet-sdk_7} $dir/dotnet + done + ) + ''; }); buildRubyMine = { pname, version, src, license, description, wmClass, buildNumber, ... }: @@ -310,6 +328,10 @@ let libdbusmenu openssl.out libxcrypt-legacy + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + expat + libxml2 + xz ]; dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' @@ -317,12 +339,12 @@ let cd $out/rust-rover # Copied over from clion (gdb seems to have a couple of patches) - ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so - ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -330,8 +352,8 @@ let autoPatchelf $PWD/bin interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper - chmod +x $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper + patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper + chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper ) ''; }); diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix b/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix index efc939d0324f..4a89ae202858 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix @@ -11,6 +11,7 @@ , unzip , libsecret , libnotify +, udev , e2fsprogs , python3 , vmopts ? null @@ -88,6 +89,21 @@ with stdenv; lib.makeOverridable mkDerivation (rec { if [ -d "plugins/remote-dev-server" ]; then patch -p1 < ${./JetbrainsRemoteDev.patch} fi + + vmopts_file=bin/linux/${vmoptsName} + if [[ ! -f $vmopts_file ]]; then + vmopts_file=bin/${vmoptsName} + if [[ ! -f $vmopts_file ]]; then + echo "ERROR: $vmopts_file not found" + exit 1 + fi + fi + echo -Djna.library.path=${lib.makeLibraryPath ([ + libsecret e2fsprogs libnotify + # Required for Help -> Collect Logs + # in at least rider and goland + udev + ])} >> $vmopts_file ''; installPhase = '' @@ -105,18 +121,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec { wrapProgram "$out/$pname/bin/${loName}.sh" \ --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ - # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib libsecret e2fsprogs - libnotify - ] ++ extraLdPath)}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ --set-default JETBRAINSCLIENT_JDK "$jdk" \ - --set ${hiName}_JDK "$jdk" \ - --set ${hiName}_VM_OPTIONS ${vmoptsFile} + --set-default ${hiName}_JDK "$jdk" \ + --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json index dd86e3e807ed..d93a243b0a37 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,15 +18,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" }, "name": "ideavim" }, @@ -35,7 +35,7 @@ "idea-ultimate" ], "builds": { - "232.9921.47": "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip" }, "name": "python" }, @@ -57,15 +57,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip", - "232.9559.28": null, - "232.9559.58": null, - "232.9559.61": null, - "232.9559.64": null, + "232.10072.15": null, + "232.10072.21": null, + "232.10072.27": null, + "232.10072.28": null, "232.9921.42": null, - "232.9921.46": null, - "232.9921.47": null, - "232.9921.48": null, - "232.9921.53": null + "232.9921.55": null, + "232.9921.83": null, + "232.9921.89": null, + "233.8264.22": null }, "name": "kotlin" }, @@ -87,15 +87,15 @@ ], "builds": { "223.8836.1185": null, - "232.9559.28": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip" + "232.10072.15": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip" }, "name": "ini" }, @@ -105,8 +105,8 @@ "phpstorm" ], "builds": { - "232.9559.64": "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/7219/408569/Symfony_Plugin-2022.1.258.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/7219/408569/Symfony_Plugin-2022.1.258.zip" }, "name": "symfony-support" }, @@ -116,8 +116,8 @@ "phpstorm" ], "builds": { - "232.9559.64": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -130,11 +130,10 @@ "rust-rover" ], "builds": { - "232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip" + "232.10072.15": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip" }, "name": "python-community-edition" }, @@ -155,14 +154,14 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" }, "name": "-deprecated-rust" }, @@ -183,14 +182,14 @@ ], "builds": { "223.8836.1185": null, - "232.9559.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, "name": "-deprecated-rust-beta" }, @@ -205,11 +204,10 @@ "webstorm" ], "builds": { - "232.9559.58": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" + "232.10072.21": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" }, "name": "ide-features-trainer" }, @@ -231,15 +229,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "233.8264.22": null }, "name": "nixidea" }, @@ -248,7 +246,7 @@ "idea-ultimate" ], "builds": { - "232.9921.47": "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip" }, "name": "go" }, @@ -270,15 +268,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/10037/243092/CSV-2.21.0.zip" }, "name": "csv-editor" }, @@ -299,16 +297,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "223.8836.1185": null, + "232.10072.15": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip" }, "name": "vscode-keymap" }, @@ -329,16 +327,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "223.8836.1185": null, + "232.10072.15": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip" }, "name": "eclipse-keymap" }, @@ -359,16 +357,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "223.8836.1185": null, + "232.10072.15": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip" }, "name": "visual-studio-keymap" }, @@ -390,15 +388,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.58": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.64": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.48": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.53": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "232.9921.55": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.89": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.8264.22": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -419,16 +417,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip" }, "name": "github-copilot" }, @@ -450,46 +448,63 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "232.9921.55": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.89": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" + }, + "22407": { + "compatible": [ + "clion", + "idea-ultimate", + "rust-rover" + ], + "builds": { + "232.10072.27": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip" + }, + "name": "rust" } }, "files": { + "https://plugins.jetbrains.com/files/10037/243092/CSV-2.21.0.zip": "sha256-Mfo8z2pjn+Gk1uumw5xpZQwpkqLRVqAu2Z07zjn2N1M=", "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=", - "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=", "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", - "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=", + "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip": "sha256-cB3DTeWhDgAwHlxwYogd0/DuYBzo5DqaRtBvEC/p8I4=", "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", - "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=", + "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip": "sha256-d54ipHXOwl3AZD5k72s1vTHzevRA4v+WfGUItGtUIn8=", "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", + "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip": "sha256-A3qx1stw9cTaD/dUmJ8q4j7yLnlvdq6yINZGuA9zDBQ=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=", "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=", - "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip": "sha256-SXzP1lg/FRroeaNQ4q5ePpDI+AiVF+dOE8tRWfm+sGk=", + "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip": "sha256-K+crYlCWZaHfBYXM4gFhEcEVW00EznfFibPo2ycAIAs=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip": "sha256-+2ow+tbZUipK92SKp0AegcRwUL1OSQuGE4FlZPOAGSk=", + "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip": "sha256-5gTCC+3ZhxQtu2dxc1U5WuYY6NswaSs29n+EOnVn/1U=", + "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip": "sha256-V8xmXBe9R/lOyk6ryaUxCr9UCZTxDiFFp7iR9KH0G/A=", + "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip": "sha256-avd+FtL7thr3btczmG/d5tsXzi7pVLd6B1mQhL/U6ts=", "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=", - "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip": "sha256-XJoRZ3ExKHkUZljuuMjMzMCcFw0A+vOyJAwtf+soHU4=", - "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip": "sha256-oUb3W64ZpXep3MsbL+/DG0kVzBQYEv6LG7jghb2aUQQ=", - "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip": "sha256-PeaqtFldh89x6wMGSM1RUR2PLSnXa7mKSojOkrFM2R8=", + "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip": "sha256-E3xWjwTxtLkOtm9748BbkKGaS4l8SlZOkj3w6VgqlFQ=", + "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip": "sha256-XIdhTQMxl/nJnntfQlHLlcyA79IS3hnGEGrXhKBFgY0=", + "https://plugins.jetbrains.com/files/7219/408569/Symfony_Plugin-2022.1.258.zip": "sha256-O4ARifSoeL5kXnFQTs6YoLcJvdg5VHks5LIgnwwUAeQ=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip": "sha256-wyqNQO4fFU9fJVbHbde/NWtY/RVOF/71o+TgWfS7VuM=", - "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip": "sha256-2oRXtVv9ima8W6vywkDX4IeUGwfVNEo4rsqYBmmWhKc=", + "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=", + "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip": "sha256-LjN0BkcnX8mVHh2dPULddVwooi9fcABkrRVhTPA7XSo=", + "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip": "sha256-R+5/E65OaEZxHY4FBUJtJUvcNYfrNHKID497FNc/R3g=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=", "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", - "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip": "sha256-NgF2KFglAczb2Aw5NMlbzFBylGW9LDWpNvnZlX+Pt3o=" + "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip": "sha256-uWAy/ugmFQBvYEQvSuuNS7xDYkzZgYGyQdSQbuvt0Lk=" } } diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index 5d04debc7b08..e6e00962c9de 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -13,7 +13,7 @@ buildInputs = [ stdenv.cc.cc.lib ]; }; "8182" = { - # Rust + # Rust (deprecated) nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; buildPhase = '' @@ -60,4 +60,14 @@ fix_offset PRELUDE_POSITION ''; }; + "22407" = { + # Rust + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + buildPhase = '' + runHook preBuild + chmod +x -R bin + runHook postBuild + ''; + }; } diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py b/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py index 9008906bde75..c15f6d7f2c3f 100755 --- a/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py +++ b/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py @@ -31,6 +31,7 @@ def download_channels(): return { channel["@name"]: channel for product in products + if "channel" in product for channel in one_or_more(product["channel"]) } diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index b627ea855053..c95feebdb674 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/versions.json +++ b/nixpkgs/pkgs/applications/editors/jetbrains/versions.json @@ -1,5 +1,5 @@ { - "linux": { + "x86_64-linux": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", @@ -11,50 +11,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "0b20f0dc61d8fd9b42962d4931c64742dd17e3f008dfec2c8863a56b1bc4be9b", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.tar.gz", - "build_number": "232.9559.28" + "version": "2023.2.2", + "sha256": "5917b88c9deeeee6019c1e5d82e4a90174bf2d9299a4bc8dac286029e4ae5d03", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.tar.gz", + "build_number": "232.10072.15" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "30a7b848d004c12e8a5ce668dea6939f49b2aaf0bcce443f02987b4ea38179ab", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.tar.gz", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "3f1ddc7290af60df6c58ebc5b27b3f10bda972920508bed00182487a6c57f1cc", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3.tar.gz", + "build_number": "232.10072.29" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "685b3eb786134137be41beaca80a0edb9aaed9e24b98cef8006fe840972b990f", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.tar.gz", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "ec10da775003055527c9b2cbf64d49524be878d06e18510acde2065ce0736b99", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "e2951dfcd80556f29378d55c8d4ebfbc6e599e14ada17a06386729221d71353b", - "url": "https://download.jetbrains.com/go/goland-2023.2.2.tar.gz", - "build_number": "232.9921.53" + "version": "2023.2.3", + "sha256": "b34fd9a42d82bcc61052f72ed75f6c1e1d7e37163de38933ee0f124ef6e6bb60", + "url": "https://download.jetbrains.com/go/goland-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "cf647137394e27b3011072e463dc2e4bcdd54dc6ea9406e487a47648fc77bd26", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.tar.gz", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "4b34fdaabb5907656ac87d50df85f13ace804d8684f3886dac07f62a93706b2e", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "8a0dc4c495b8547fafa90eb81b6fdfc4a9fbbc7b5806d20ebb2f6538330cd3a5", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "b395e37c797c10c0fd0c4ccf6e735852fb40bec5fbbc98705f481f6f068c7993", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,59 +67,182 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "bcb506fa27078f78da44a38f4fbab0a2000cea26385f51800c931d0cbd1b47c4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.1.tar.gz", - "build_number": "232.9559.64", + "version": "2023.2.2", + "sha256": "5e3dd021b82dcad0f51bded677aa87680dcc3f5d843951c48848a9191141bf1d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.tar.gz", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "5956c6cb5a5bad1d9749e487b3bb69fcbf0170f52324e4ff009283b723838778", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1.tar.gz", - "build_number": "232.9559.58" + "version": "2023.2.2", + "sha256": "2bb4f73d041b818a7b631feb3fee77036de764543c669efe9cf6766510a68e3f", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2.tar.gz", + "build_number": "232.9921.89" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "8f7c0aca8f2a832164426393e55d543b3b56867f2497d8844547fb03e217f160", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.tar.gz", - "build_number": "232.9559.58" + "version": "2023.2.2", + "sha256": "f7263b17e2456efcb5efab1eac53aafb6a0be1a7f9fbf25a419c9d7b447f6ded", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2.tar.gz", + "build_number": "232.9921.89" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "a44872d0fc330b1cc58bb7db5c8397f4ae7d972bc0c48a66defac10121ecc645", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.tar.gz", - "build_number": "232.9559.61" + "version": "2023.2.2", + "sha256": "a32b2d0682613f3afacd11eac1a79f022c99e17ef9ab23fe26c5d8d34b093ad8", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.tar.gz", + "build_number": "232.9921.83" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "9f14f95ef1952d6b85e13a596d00e8b57ab35a4d07a96ee33d4ceebbd113a827", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.tar.gz", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "068b8c486cd61755787538ea036608a9aa590a3b49cd9003dd5edce28d322c02", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.tar.gz", + "build_number": "232.10072.21" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2023.2", - "sha256": "5a51bcae179467e9c6440bc0c31bffd27c6fc58d593a0cbecd5aeb51508d27b6", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46.tar.gz", - "build_number": "232.9921.46" + "version": "2023.3 EAP", + "sha256": "3dd8e99b066164efc11e86e3289e444c5238dfce8e9142fe2d3a8c340eeeb175", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.tar.gz", + "build_number": "233.8264.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "version": "2023.2.3", + "sha256": "b57f4a71361a224aeb0e80f2f311f632ab1757356a2de3627ade3e9dd4ee0899", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.tar.gz", + "build_number": "232.10072.28" + } + }, + "aarch64-linux": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", "version": "2023.2.2", - "sha256": "10c1203620258bf4b0c952d809f50ea954f80d1ed60098917a4c64fb2718b931", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.tar.gz", + "sha256": "9ceeda2fc4f99e160f7402e0cc0712e480eaa1c12b86feac028bb0d191806d41", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.tar.gz", "build_number": "232.9921.42" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "8b4372405832cf377cf4e4af4b240383231f62397249c9aee7eda54052410bd2", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.tar.gz", + "build_number": "232.10072.15" + }, + "dataspell": { + "update-channel": "DataSpell RELEASE", + "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "43f9f4e7c1d19c077aa0cfc76561477955f7b61414ec4fa12b7079870ef0bf1b", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.29" + }, + "gateway": { + "update-channel": "Gateway RELEASE", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "c186170fd0d6322a61cb1233c2827691aebd86ab06f3cd1b3733dcc422c9290e", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "60ef96e70ee2fab3ce04f30ba887cc7f4f62d499811e2050f534ede06a23cbb6", + "url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "9e6402c323d74f9c88aaea13d0fb0027786a1ac3dbee232794d071132bf7a5ce", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "b895aebe1803a1d8d58f8ae29a5072bcd496ca75ecdf8f554390a2c90b76fa3b", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "version": "2022.3", + "sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b", + "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz", + "build_number": "223.8836.1185" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "b3067ffa32fab0880ffce8dff000d463b86bef9b30f53fc4d41f5d4e518c7528", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.tar.gz", + "build_number": "232.9921.55", + "version-major-minor": "2022.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "7d15908f9261ee7905b61d83d4a048fee1e3a2fea9465ada1fc459b2ea0e4d5f", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2-aarch64.tar.gz", + "build_number": "232.9921.89" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "2cf259859847f7a979565f31faa60148d571206c78c9309dcdf867b76c16ef25", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2-aarch64.tar.gz", + "build_number": "232.9921.89" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "a41f97a86c84157cb36b085ad3c526263414e6c8157be311f38491e715631daa", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.tar.gz", + "build_number": "232.9921.83" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "613732ccdb38e1bc0d2ecd2ead464c74ed643f1b6d99695987c1bcc78784fbf3", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.21" + }, + "rust-rover": { + "update-channel": "RustRover EAP", + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", + "version": "2023.3 EAP", + "sha256": "812c33f46f8c7e309e777f10b6806b3658d7f90f95aa1a776c686aafabb290e7", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.tar.gz", + "build_number": "233.8264.22" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "2b0ead390f94c6b1d2069a078d6882e7ff3d0af280ff15b8481606d3f500fe0d", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.28" } }, "x86_64-darwin": { @@ -134,50 +257,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.2.1", - "sha256": "1ceabbebd391f5778ef495a780b0e9b54584342d6e55cc28834e8f708759b440", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.dmg", - "build_number": "232.9559.28" + "version": "2023.2.2", + "sha256": "cafd9cfbdd4453a587674324e617977c9f9536bbe7aa290cc39b0c3c5c842bba", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.dmg", + "build_number": "232.10072.15" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.2.2", - "sha256": "24fb47966c891bf3a2a827df38885d48509c6e2e68a7cc03145ad28493adb76b", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "f8d4b3a7a36fbbd77a4b6e965cd159f4adeff54933df1e8caf2e4f341e3443c7", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3.dmg", + "build_number": "232.10072.29" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.2.2", - "sha256": "cfa68c2b1290f1d51aa37a918a79342e42b6a50b2563524757ec8bd700008fba", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "25780bcbb57ebc1a7a05bec24abf21b2a96b22f80a91de89c94926799da3183f", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.dmg", + "build_number": "232.10072.27" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.2.2", - "sha256": "d60e55ecd6208d2af871c154320f988622cd52ca4b202cd9a90c2de7750e8e23", - "url": "https://download.jetbrains.com/go/goland-2023.2.2.dmg", - "build_number": "232.9921.53" + "version": "2023.2.3", + "sha256": "5e78a73a69481fd63ad53d99371b3e7e534731c6116ee6d7fee127c533bc644a", + "url": "https://download.jetbrains.com/go/goland-2023.2.3.dmg", + "build_number": "232.10072.27" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.2.2", - "sha256": "a59590af2bef95562f3b7a066016d22f347d59b71e136d3dd739d626f1594636", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "dbdda6a0df334a402103d3ee1e70cd5f514cc9353efcdd49395a736c9a640730", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.dmg", + "build_number": "232.10072.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.2.2", - "sha256": "f420cc60d925415a7059b3283176b4aafef3555c06746b9617cf50edef62fe69", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "fddefd00d6a96ec8c3bd81f9183f3b70d4df71d460f9c704519abffb95246e0f", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.dmg", + "build_number": "232.10072.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -190,59 +313,59 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.2.1", - "sha256": "5d238f0d3ddd59762256dc406ae2430e5abf79f9a04488722a87e54b70db68ef", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.1.dmg", - "build_number": "232.9559.64", + "version": "2023.2.2", + "sha256": "99a9bb313a5c141ecd1810306deaca3cf52d338edf206362b3f9d9337a27890e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.dmg", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.2.1", - "sha256": "5bbbfd755d407e75a77900e3a5367dc7ec4f4ddde3311625341b3c35353b126b", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1.dmg", - "build_number": "232.9559.58" + "version": "2023.2.2", + "sha256": "f482b6d451efec897764487b116f7bf09d507a5ebfb841c33e2abd2441c3b3a7", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2.dmg", + "build_number": "232.9921.89" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.2.1", - "sha256": "56747a699b16387df1c0c8cb5bd2d52c8ce7fe670054e5f37352b381d7272dbe", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.dmg", - "build_number": "232.9559.58" + "version": "2023.2.2", + "sha256": "830f590d63199b389bbaa955c8602fa027bc1eb25bd8ce5636474eec72745b58", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2.dmg", + "build_number": "232.9921.89" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.2.1", - "sha256": "e80c8939c9e9c5357e65e561175a37cfac745aa60e08505c6cf48ecf9eaa4ce3", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.dmg", - "build_number": "232.9559.61" + "version": "2023.2.2", + "sha256": "8fa1c224eccfffe896de8b375160e5d9f63103912f935748199cca758448fc9e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.dmg", + "build_number": "232.9921.83" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.2.2", - "sha256": "2b77f24770813c0cf55892effde8c0a6a5af1c9f4b08c1c8ae9163e503afc5d3", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "eb0db28facbe7aed6de99dc97053cdfbeea845ce73b6b9efa6c95caaf68204e9", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.dmg", + "build_number": "232.10072.21" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2023.2", - "sha256": "4c7193acf07f44b91512d8b4c04c88068b8599e76150a81dfd728046910a0929", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46.dmg", - "build_number": "232.9921.46" + "version": "2023.3 EAP", + "sha256": "889ed748efbd44b76da03186efac063baf36c2208d919550dd97cf2dae8f40e3", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.dmg", + "build_number": "233.8264.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.2.2", - "sha256": "3733f1968925681a693a09053e62ba4a800b51a062f5e9772658a5fba82d2fa8", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.dmg", - "build_number": "232.9921.42" + "version": "2023.2.3", + "sha256": "918bb2061d623f736c73b67db929ced2a83013f64d57406af09f5c9df9c7d8cd", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.dmg", + "build_number": "232.10072.28" } }, "aarch64-darwin": { @@ -257,50 +380,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "bcca68af7d5b04d21a6a2a652c0d828ef450d117ab13af74bcf7ff71a803cfdd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1-aarch64.dmg", - "build_number": "232.9559.28" + "version": "2023.2.2", + "sha256": "30458ba96e1a518a40c0fc89d35f70ea96803cccd5ce8aca72e2363745214c87", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.dmg", + "build_number": "232.10072.15" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "0baeeba5f8a2dd02304b42a54d633719df3242bfaedc5b62bec4dacd403eabf2", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.2-aarch64.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "4f26303afa3d2359ea4b0bcee875b605dcaadaece3d1b0e16e5c37b8ea46afe3", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.dmg", + "build_number": "232.10072.29" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b6ae26eaa6f7f4b77d1bf3d75658eb8ae70bccce4b7e8e62d18dada0810b382c", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2-aarch64.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "b4c1167303ed8985c5439d6a07f9d2970074e3748c21e9155b2c76a508fe0a15", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b8343e424f1c954ef2c8db7dabc4aaad63d055aa7a4b572773dbeeab43463007", - "url": "https://download.jetbrains.com/go/goland-2023.2.2-aarch64.dmg", - "build_number": "232.9921.53" + "version": "2023.2.3", + "sha256": "3ad91c136fd840dbc596f2873ccc4c2df14f7ec2a435f8a61acfdc3a97660e32", + "url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b3c126636d2096933672d1c1359fe32ad04d35057090363ad1812951f2ada7d9", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2-aarch64.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "563d2189f1ae0310abd108f256edca786ca732100344b3519a7201245e4af781", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b649cb8c82190ca8682bad9b37da93f10981d35850f501c196ad106edf96cd44", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2-aarch64.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "4ee862a5f5b2f8d9276744bd67cd024a5c6740601e2168a985a5c66cb43e18ea", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -313,59 +436,59 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "886e79089e5e783739e71f57f8f20b9ecbc2e9e7cc9b941bb99d1444181939df", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.1-aarch64.dmg", - "build_number": "232.9559.64", + "version": "2023.2.2", + "sha256": "a31daeddae532324436b2d11acbd5fb657721883f17c7ef4457ac76a51bd4189", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.dmg", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "4bc1462299de2202c7171f34ad1b7c51f83f2227e0e891cf8a8098f8494e781d", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1-aarch64.dmg", - "build_number": "232.9559.58" + "version": "2023.2.2", + "sha256": "2bcddf3e58902578745dd1803f17ebd18f4c98dc76bf48b0945afbc7bae45832", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2-aarch64.dmg", + "build_number": "232.9921.89" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "82722d522176ca9aac0e919a38c3b88155e6e3cc104b64204755a9657a180b52", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1-aarch64.dmg", - "build_number": "232.9559.58" + "version": "2023.2.2", + "sha256": "5d4292dd0e40db35199ebcd6472d4b46c505d3357d2324690338758355e0f092", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2-aarch64.dmg", + "build_number": "232.9921.89" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "d12db1a3b5c62999efd18af179c420f5173b7820c2fe736b1d19bb157604c19b", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1-aarch64.dmg", - "build_number": "232.9559.61" + "version": "2023.2.2", + "sha256": "89c30f905216480ba0e379705542d81beac6e7467d26fe3aa882e9b008de42c2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.dmg", + "build_number": "232.9921.83" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "53e551897d42d0986b2e01f171bd7b96fe790516fdf1578feabec0a44cf441e5", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2-aarch64.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "db571f72488e299d700670c546fb5ae9e1b1bc1eff3f2b26ef8520a22b1fb407", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.dmg", + "build_number": "232.10072.21" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "7f01fef11d89c6c6c870a79007607babde40f7a958b7103d1028aa760ed713b7", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46-aarch64.dmg", - "build_number": "232.9921.46" + "version": "2023.3 EAP", + "sha256": "9c4f26089697f6cb394e971dac8ef4fe974b5ecffd63311fcf0be66d4b4aec59", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.dmg", + "build_number": "233.8264.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "27ae504b6ee24df28d29f59602c893c2b9af9357e4cc1e20dab22753177508db", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2-aarch64.dmg", - "build_number": "232.9921.42" + "version": "2023.2.3", + "sha256": "8811624166bf11d591bcf24fee0087861c3193a79aecb7159cced17737d88517", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.dmg", + "build_number": "232.10072.28" } } } diff --git a/nixpkgs/pkgs/applications/editors/ldtk/default.nix b/nixpkgs/pkgs/applications/editors/ldtk/default.nix index 4d8dc4d58dc5..a9688241ab1d 100644 --- a/nixpkgs/pkgs/applications/editors/ldtk/default.nix +++ b/nixpkgs/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; - version = "1.3.4"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; - hash = "sha256-/EFmuzj8hYhQJegZpZhZb4fuSeMF9wdG1Be4duEvW54="; + hash = "sha256-Qt6ADyIbhuxFGh7IP1WwcsvMtjOUZoTd99GeWt5s4UM="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; diff --git a/nixpkgs/pkgs/applications/editors/mg/default.nix b/nixpkgs/pkgs/applications/editors/mg/default.nix index 0dc52b863014..c54cd01dbf28 100644 --- a/nixpkgs/pkgs/applications/editors/mg/default.nix +++ b/nixpkgs/pkgs/applications/editors/mg/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; license = licenses.publicDomain; + mainProgram = "mg"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/editors/neovim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/default.nix index 9bf6fb51bdff..e183799d853a 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -7,6 +7,7 @@ , buildPackages , treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; } , CoreServices +, fixDarwinDylibNames , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc), see @@ -16,8 +17,29 @@ }: let + nvim-lpeg-dylib = luapkgs: if stdenv.isDarwin + then (luapkgs.lpeg.overrideAttrs (oa: { + preConfigure = '' + # neovim wants clang .dylib + sed -i makefile -e "s/CC = gcc/CC = clang/" + sed -i makefile -e "s/-bundle/-dynamiclib/" + ''; + preBuild = '' + # there seems to be implicit calls to Makefile from luarocks, we need to + # add a stage to build our dylib + make macosx + mkdir -p $out/lib + mv lpeg.so $out/lib/lpeg.dylib + ''; + nativeBuildInputs = + oa.nativeBuildInputs + ++ ( + lib.optional stdenv.isDarwin fixDarwinDylibNames + ); + })) + else luapkgs.lpeg; requiredLuaPkgs = ps: (with ps; [ - lpeg + (nvim-lpeg-dylib ps) luabitop mpack ] ++ lib.optionals doCheck [ @@ -40,20 +62,21 @@ let deterministicStringIds = true; self = deterministicLuajit; }; - in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) + in deterministicLuajit.withPackages(ps: [ ps.mpack (nvim-lpeg-dylib ps) ]) else lua.luaOnBuild; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); + in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - hash = "sha256-kKstlq1BzoBAy+gy9iL1auRViJ223cVpAt5X7pUWT1U="; + hash = "sha256-Lyo98cAs7Zhx23N4s4f3zpWFKYJMmXleWpt3wiVDQZo="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 2352cdb82a44..0fbb54df01ac 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -39,11 +39,9 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # "--add-flags" (lib.escapeShellArgs flags) - # wrapper args used both when generating the manifest and in the final neovim executable - commonWrapperArgs = (lib.optionals (lib.isList wrapperArgs) wrapperArgs) + commonWrapperArgs = # vim accepts a limited number of commands so we join them all - ++ [ + [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' # (lib.intersperse "|" hostProviderViml) ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ diff --git a/nixpkgs/pkgs/applications/editors/okteta/default.nix b/nixpkgs/pkgs/applications/editors/okteta/default.nix index c4fd772d35a4..72ff8ae5d605 100644 --- a/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.10"; + version = "0.26.13"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-KKYU9+DDK0kXperKfgxuysqHsTGRq1NKtAT1Vps8M/o="; + sha256 = "0wlpv0rk4ys4rbcpf8lqpkm0yr5dxkaz60qk2lvm27w1s489ir8l"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; @@ -31,6 +31,7 @@ mkDerivation rec { meta = with lib; { license = licenses.gpl2; description = "A hex editor"; + homepage = "https://apps.kde.org/okteta/"; maintainers = with maintainers; [ peterhoeg bkchr ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/editors/openvi/default.nix b/nixpkgs/pkgs/applications/editors/openvi/default.nix index 19da3daf78fc..83abef98152b 100644 --- a/nixpkgs/pkgs/applications/editors/openvi/default.nix +++ b/nixpkgs/pkgs/applications/editors/openvi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.4.23"; + version = "7.4.24"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-DwecSnByRkjBFqy3gWJ0+1srF2YsNACqKrAITn6wXJw="; + hash = "sha256-jfh82Ti8iVqsh7G9BnHbc3cQP8D9dGV71YJ28SBjjgA="; }; buildInputs = [ ncurses perl ]; diff --git a/nixpkgs/pkgs/applications/editors/orbiton/default.nix b/nixpkgs/pkgs/applications/editors/orbiton/default.nix index 41b9d0b1f9da..a4822d431543 100644 --- a/nixpkgs/pkgs/applications/editors/orbiton/default.nix +++ b/nixpkgs/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.64.3"; + version = "2.65.2"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-mx6k6OXr3iTCD1FTC7J1fnz7Gs/GyggHXnVywuPo5BY="; + hash = "sha256-wuRbn3zQlyqba21tKLVCRfs8QgreWQ+FBFDw6myoYbk="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/editors/pulsar/default.nix b/nixpkgs/pkgs/applications/editors/pulsar/default.nix index e0b967f8043c..d2162dc9c9ef 100644 --- a/nixpkgs/pkgs/applications/editors/pulsar/default.nix +++ b/nixpkgs/pkgs/applications/editors/pulsar/default.nix @@ -1,44 +1,76 @@ { lib , stdenv , git -, runtimeShell , fetchurl , wrapGAppsHook +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, gdk-pixbuf , glib , gtk3 -, atomEnv +, mesa +, nss +, nspr , xorg +, libdrm +, libsecret , libxkbcommon -, hunspell +, pango +, systemd , hunspellDicts , useHunspell ? true , languages ? [ "en_US" ] , withNemoAction ? true , makeDesktopItem , copyDesktopItems -, makeWrapper , asar , python3 }: let pname = "pulsar"; - version = "1.108.0"; + version = "1.109.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-9wxMKekowNkFX+m3h2ZeTXu/uMLyPi6IIbseJ16shG4="; + x86_64-linux.hash = "sha256-pIm3mI1YdfapxXgIciSHtI4LeqMw5RdYTnH+eHUQ4Yo="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U="; + aarch64-linux.hash = "sha256-KIY/qzfl7CU0YwIgQlNHoAMhLfrTbQe7ZZvzdkUVw+M="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - additionalLibs = lib.makeLibraryPath [ + newLibpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libsecret + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr xorg.libxshmfence libxkbcommon xorg.libxkbfile + pango stdenv.cc.cc.lib + systemd ]; - newLibpath = "${atomEnv.libPath}:${additionalLibs}"; # Hunspell hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages; diff --git a/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index a3eee45ed4d0..d68925e752f4 100644 --- a/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, buildFHSEnvChroot, callPackage, makeDesktopItem, writeScript +{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell +, runCommand, quartus-prime-lite , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } }: @@ -13,10 +14,15 @@ let categories = [ "Development" ]; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` -in buildFHSEnvChroot rec { +in buildFHSEnv rec { name = "quartus-prime-lite"; # wrapped targetPkgs = pkgs: with pkgs; [ + (runCommand "ld-lsb-compat" {} '' + mkdir -p "$out/lib" + ln -sr "${glibc}/lib/ld-linux-x86-64.so.2" "$out/lib/ld-lsb-x86-64.so.3" + ln -sr "${pkgsi686Linux.glibc}/lib/ld-linux.so.2" "$out/lib/ld-lsb.so.3" + '') # quartus requirements glib xorg.libICE @@ -26,6 +32,10 @@ in buildFHSEnvChroot rec { xorg.libXtst xorg.libXi ]; + + # Also support 32-bit executables. + multiArch = true; + multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? freetype = pkgs.freetype.override { libpng = libpng12; }; @@ -47,46 +57,67 @@ in buildFHSEnvChroot rec { libxcrypt-legacy ]; - passthru = { inherit unwrapped; }; - - extraInstallCommands = let - quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [ - "asm" "cdb" "cpf" "drc" "eda" "fit" "jbcc" "jli" "map" "pgm" "pow" - "sh" "si" "sim" "sta" "stp" "tan" - ]) ++ [ "quartus/bin/quartus" ]; - - qsysExecutables = map (c: "quartus/sopc_builder/bin/qsys-${c}") [ - "generate" "edit" "script" - ]; - # Should we install all executables ? - modelsimExecutables = map (c: "modelsim_ase/bin/${c}") [ - "vsim" "vlog" "vlib" - ]; - in '' + extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/128x128 ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${unwrapped}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png - mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin - WRAPPER=$out/bin/${name} - EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" - for executable in $EXECUTABLES; do - echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable + progs_to_wrap=( + "${unwrapped}"/quartus/bin/* + "${unwrapped}"/quartus/sopc_builder/bin/qsys-{generate,edit,script} + # Should we install all executables? + "${unwrapped}"/modelsim_ase/bin/{vsim,vlog,vlib,vcom,vdel,vmap} + "${unwrapped}"/modelsim_ase/linuxaloem/lmutil + ) + + wrapper=$out/bin/${name} + progs_wrapped=() + for prog in ''${progs_to_wrap[@]}; do + relname="''${prog#"${unwrapped}/"}" + wrapped="$out/$relname" + progs_wrapped+=("$wrapped") + mkdir -p "$(dirname "$wrapped")" + echo "#!${runtimeShell}" >> "$wrapped" + case "$relname" in + modelsim_ase/*) + echo "export NIXPKGS_IS_MODELSIM_WRAPPER=1" >> "$wrapped" + ;; + esac + echo "$wrapper $prog \"\$@\"" >> "$wrapped" done cd $out - chmod +x $EXECUTABLES + chmod +x ''${progs_wrapped[@]} # link into $out/bin so executables become available on $PATH - ln --symbolic --relative --target-directory ./bin $EXECUTABLES + ln --symbolic --relative --target-directory ./bin ''${progs_wrapped[@]} ''; - # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when - # starting most operations in many containerized environments, including WSL2, Docker, and LXC - # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version - # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 - runScript = writeScript "${name}-wrapper" '' - exec env LD_PRELOAD=libudev.so.0 "$@" + profile = '' + # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when + # starting most operations in many containerized environments, including WSL2, Docker, and LXC + # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) + # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version + # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 + # + # But, as can be seen in the above resource, LD_PRELOADing libudev breaks + # compiling encrypted device libraries in ModelSim (with error + # `(vlog-2163) Macro `<protected> is undefined.`), so only use LD_PRELOAD + # for non-ModelSim wrappers. + if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + fi ''; + + # Run the wrappers directly, instead of going via bash. + runScript = ""; + + passthru = { + inherit unwrapped; + tests = { + modelsimEncryptedModel = runCommand "quartus-prime-lite-test-modelsim-encrypted-model" {} '' + "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v" + touch "$out" + ''; + }; + }; } diff --git a/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/nixpkgs/pkgs/applications/editors/rstudio/default.nix index a619c636cd53..82a572eaf4c5 100644 --- a/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -16,13 +16,13 @@ , qtsensors , qtwebengine , qtwebchannel +, quarto , libuuid , hunspellDicts , unzip , ant , jdk , gnumake -, makeWrapper , pandoc , llvmPackages , yaml-cpp @@ -40,39 +40,39 @@ let pname = "RStudio"; - version = "2022.07.1+554"; - RSTUDIO_VERSION_MAJOR = "2022"; - RSTUDIO_VERSION_MINOR = "07"; - RSTUDIO_VERSION_PATCH = "1"; - RSTUDIO_VERSION_SUFFIX = "+554"; + version = + "${RSTUDIO_VERSION_MAJOR}.${RSTUDIO_VERSION_MINOR}.${RSTUDIO_VERSION_PATCH}${RSTUDIO_VERSION_SUFFIX}"; + RSTUDIO_VERSION_MAJOR = "2023"; + RSTUDIO_VERSION_MINOR = "09"; + RSTUDIO_VERSION_PATCH = "0"; + RSTUDIO_VERSION_SUFFIX = "+463"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0rmdqxizxqg2vgr3lv066cjmlpjrxjlgi0m97wbh6iyhkfm2rrj1"; + hash = "sha256-FwNuU2rbE3GEhuwphvZISUMhvSZJ6FjjaZ1oQ9F8NWc="; }; mathJaxSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; - sha256 = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; + hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; }; rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "e287b586e7da03105de3faa8774c63f08984eb3c"; - sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y="; + rev = "5175a927a41acfd9a21d9fdecb705ea3292109f2"; + hash = "sha256-c1fFcN6KAfxXv8bv4WnIqQKg1wcNP2AywhEmIbyzaBA="; }; - panmirrorModules = mkYarnModules rec { - inherit pname version; - packageJSON = ./package.json; - yarnLock = "${src}/src/gwt/panmirror/src/editor/yarn.lock"; - offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-v05Up6VMlYlvgUYQVYo+YfpcsMohliNfMgyjq6QymCI="; - }; + # Ideally, rev should match the rstudio release name. + # e.g. release/rstudio-mountain-hydrangea + quartoSrc = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto"; + rev = "bb264a572c6331d46abcf087748c021d815c55d7"; + hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g="; }; description = "Set of integrated tools for the R language"; @@ -86,7 +86,6 @@ in unzip ant jdk - makeWrapper pandoc nodejs ] ++ lib.optionals (!server) [ @@ -102,6 +101,7 @@ in yaml-cpp soci postgresql + quarto ] ++ (if server then [ sqlite.dev pam @@ -118,7 +118,7 @@ in "-DRSTUDIO_USE_SYSTEM_SOCI=ON" "-DRSTUDIO_USE_SYSTEM_BOOST=ON" "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" - "-DQUARTO_ENABLED=FALSE" + "-DQUARTO_ENABLED=TRUE" "-DPANDOC_VERSION=${pandoc.version}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" ] ++ lib.optionals (!server) [ @@ -132,8 +132,7 @@ in ./use-system-node.patch ./fix-resources-path.patch ./pandoc-nix-path.patch - ./remove-quarto-from-generator.patch - ./do-not-install-pandoc.patch + ./use-system-quarto.patch ]; postPatch = '' @@ -143,16 +142,23 @@ in --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' substituteInPlace src/gwt/build.xml \ + --replace '@node@' ${nodejs} \ + --replace './lib/quarto' ${quartoSrc} + + substituteInPlace src/cpp/conf/rsession-dev.conf \ --replace '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ --replace '@libclang@' ${llvmPackages.libclang.lib} \ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin/pandoc + substituteInPlace src/cpp/session/CMakeLists.txt \ + --replace '@pandoc@' ${pandoc} \ + --replace '@quarto@' ${quarto} - sed '1i#include <set>' -i src/cpp/core/include/core/Thread.hpp + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace '@pandoc@' ${pandoc}/bin \ + --replace '@quarto@' ${quarto} ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -180,8 +186,6 @@ in cp -r ${rsconnectSrc} dependencies/rsconnect ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) - - cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules ''; postInstall = '' @@ -205,14 +209,14 @@ in rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} ''; - meta = with lib; { + meta = { broken = (stdenv.isLinux && stdenv.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ciil cfhammill ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ciil cfhammill ]; mainProgram = "rstudio" + lib.optionalString server "-server"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; passthru = { diff --git a/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch b/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch deleted file mode 100644 index 25bfb2b1e8f4..000000000000 --- a/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -60,8 +60,7 @@ - - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR -- RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR) -+ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) - - # validate existence - if(NOT EXISTS "${${VAR}}") - diff --git a/nixpkgs/pkgs/applications/editors/rstudio/package.json b/nixpkgs/pkgs/applications/editors/rstudio/package.json deleted file mode 100644 index 6677ca9e06de..000000000000 --- a/nixpkgs/pkgs/applications/editors/rstudio/package.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "panmirror", - "version": "0.1.0", - "private": true, - "license": "agpl-3.0", - "dependencies": { - "@types/ace": "^0.0.43", - "@types/clipboard": "^2.0.7", - "@types/diff-match-patch": "^1.0.32", - "@types/js-yaml": "^4.0.3", - "@types/lodash.debounce": "^4.0.6", - "@types/lodash.orderby": "^4.6.6", - "@types/lodash.uniqby": "^4.7.6", - "@types/orderedmap": "^1.0.0", - "@types/pinyin": "^2.10.0", - "@types/prosemirror-commands": "^1.0.4", - "@types/prosemirror-dropcursor": "^1.0.3", - "@types/prosemirror-gapcursor": "^1.0.4", - "@types/prosemirror-history": "^1.0.3", - "@types/prosemirror-inputrules": "^1.0.4", - "@types/prosemirror-keymap": "^1.0.4", - "@types/prosemirror-schema-list": "^1.0.3", - "@types/prosemirror-tables": "^0.9.1", - "@types/react": "^17.0.20", - "@types/react-dom": "^17.0.9", - "@types/react-window": "^1.8.5", - "@types/transliteration": "^1.6.6", - "@types/zenscroll": "^4.0.1", - "biblatex-csl-converter": "^2.0.2", - "clipboard": "^2.0.8", - "diff-match-patch": "^1.0.5", - "fuse.js": "^6.4.6", - "js-yaml": "^4.1.0", - "lodash.debounce": "^4.0.8", - "lodash.orderby": "^4.6.0", - "lodash.uniqby": "^4.7.0", - "orderedmap": "^1.0.0", - "pinyin": "^2.10.2", - "prosemirror-changeset": "^2.1.2", - "prosemirror-commands": "^1.1.10", - "prosemirror-dev-tools": "^2.1.1", - "prosemirror-dropcursor": "^1.3.5", - "prosemirror-gapcursor": "^1.1.5", - "prosemirror-history": "^1.2.0", - "prosemirror-inputrules": "^1.1.3", - "prosemirror-keymap": "^1.1.4", - "prosemirror-model": "^1.14.3", - "prosemirror-schema-list": "^1.1.5", - "prosemirror-state": "^1.3.4", - "prosemirror-tables": "^1.1.1", - "prosemirror-transform": "^1.3.2", - "prosemirror-utils": "^0.9.6", - "prosemirror-view": "^1.20.1", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-window": "^1.8.6", - "sentence-splitter": "^3.2.2", - "thenby": "^1.3.3", - "tlite": "^0.1.9", - "transliteration": "^2.2.0", - "typescript": "3.8.3", - "zenscroll": "^4.0.2" - }, - "scripts": { - "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"", - "lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'", - "watch": "tsc --watch --noEmit --project './tsconfig.json'", - "generate-symbols": "ts-node tools/generate-symbols.ts" - }, - "devDependencies": { - "@types/node": "^14.0.4", - "@types/unzip": "^0.1.1", - "fast-xml-parser": "^3.17.1", - "fuse-box": "^3.7.1", - "prettier": "^1.18.2", - "terser": "^4.6.2", - "ts-node": "^8.10.2", - "tslint": "^5.20.0", - "tslint-config-prettier": "^1.18.0", - "tslint-react": "^5.0.0", - "typescript-tslint-plugin": "^0.5.5", - "uglify-js": "^3.7.4", - "unzip": "^0.1.11" - } -} diff --git a/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch index a2b9bbd9f02b..2782a5a0d7a2 100644 --- a/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch +++ b/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch @@ -1,11 +1,18 @@ --- a/src/cpp/session/include/session/SessionConstants.hpp +++ b/src/cpp/session/include/session/SessionConstants.hpp -@@ -140,7 +140,7 @@ +@@ -142,13 +142,13 @@ + #define kSessionTmpDir "rstudio-rsession" + #ifdef QUARTO_ENABLED - # define kDefaultPandocPath "bin/quarto/bin" - #else --# define kDefaultPandocPath "bin/pandoc" +-# define kDefaultPandocPath "bin/quarto/bin/tools" +# define kDefaultPandocPath "@pandoc@" + #else + # define kDefaultPandocPath "bin/pandoc" #endif - #define kDefaultQuartoPath "bin/quarto" + #define kDefaultNodePath "bin/node" +-#define kDefaultQuartoPath "bin/quarto" ++#define kDefaultQuartoPath "@quarto@" + #define kDefaultRsclangPath "bin/rsclang" + + #ifdef _WIN32 diff --git a/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch b/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch deleted file mode 100644 index 1c28bbada6da..000000000000 --- a/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -43,12 +43,6 @@ - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") - endif() - -- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") -- else() -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") -- endif() -- - endif() - - -@@ -67,14 +61,7 @@ - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR - RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR -- RSTUDIO_DEPENDENCIES_QUARTO_DIR) -- -- -- # skip quarto if not enabled -- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) -- continue() -- endif() -+ RSTUDIO_DEPENDENCIES_PANDOC_DIR) - - # validate existence - if(NOT EXISTS "${${VAR}}") - diff --git a/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch b/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch index 248f4fe86e21..bb4480b4ae5f 100644 --- a/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch @@ -1,29 +1,88 @@ +diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf +index d18362b..98cdd4c 100644 +--- a/src/cpp/conf/rsession-dev.conf ++++ b/src/cpp/conf/rsession-dev.conf +@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR} + external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} + external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} + external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang +-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node ++external-node-path=@node@/bin/node + + # enable copilot + copilot-enabled=1 +diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt +index 30dd638..cb4a645 100644 +--- a/src/cpp/server/CMakeLists.txt ++++ b/src/cpp/server/CMakeLists.txt +@@ -250,10 +250,6 @@ if (UNIX AND NOT APPLE) + DESTINATION ${RSERVER_SYSTEMD_DIR}) + + # install node +- install( +- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/" +- DESTINATION "${RSTUDIO_INSTALL_BIN}/node" +- USE_SOURCE_PERMISSIONS) + + elseif(APPLE) + +diff --git a/src/gwt/build.xml b/src/gwt/build.xml +index 033d605..f1ee63d 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -83,24 +83,7 @@ - <echo>Concatenated acesupport files to 'acesupport.js'</echo> - </target> - -- <!-- panmirror typescript library --> -- <!-- ensure version matches RSTUDIO_NODE_VERSION --> -- <property name="node.version" value="16.14.0"/> -- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> -- <condition property="node.bin" value="../../../${node.dir}/bin/node"> +@@ -87,29 +87,7 @@ + <!-- ensure version matches RSTUDIO_NODE_VERSION --> + <property name="node.version" value="16.14.0"/> + <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> +- <!-- use yarn from system but will prefer yarn from dependencies if available --> +- <condition property="yarn.bin" value="yarn"> - <not> - <os family="windows" /> - </not> - </condition> -- <condition property="node.bin" value="${node.dir}/node.exe"> +- <available +- property="yarn.bin" +- value="${node.dir}/bin/yarn" +- file="${node.dir}/bin/yarn"/> +- <condition property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd"> - <os family="windows" /> - </condition> -- -- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) --> +- <!-- use yarn from /opt/rstudio-tools if installed (typical for Docker) --> +- <available +- property="yarn.bin" +- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn" +- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/> +- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) --> - <available -- property="node.bin" -- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node" -- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/> -+ <property name="node.bin" value="@node@/bin/node"/> +- property="yarn.bin" +- value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd" +- file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/> ++ <property name="node.bin" value="@node@/bin/node"/> - <property name="panmirror.dir" value="./panmirror/src/editor"/> + <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> - +@@ -126,21 +104,11 @@ + file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/> + + <target name="panmirror" description="Compile panmirror library"> +- <echo message="yarn location: ${yarn.bin}"/> +- <echo message="panmirror location: ${panmirror.dir}"/> + <mkdir dir="${panmirror.build.dir}"/> +- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> +- <arg value="install"/> +- <arg value="--network-timeout"/> +- <arg value="240000"/> +- </exec> +- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> +- <arg value="build"/> +- <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/> ++ <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}"> ++ <arg value="fuse"/> ++ <arg value="${panmirror.target}"/> + </exec> +- <copy todir="${panmirror.build.dir}"> +- <fileset dir="${panmirror.dir}/dist-rstudio"/> +- </copy> + </target> + + <target name="javac" description="Compile java source"> diff --git a/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch b/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch new file mode 100644 index 000000000000..89653219dbea --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch @@ -0,0 +1,46 @@ +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -36,18 +36,14 @@ + else() + set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries") + endif() +- ++ + if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + else() + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") + endif() + +- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") +- else() +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") +- endif() ++ set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@") + + endif() + +@@ -56,7 +52,7 @@ + # - by default, we use quarto + quarto's bundled pandoc + # - if quarto is not enabled, use pandoc fallback + if(QUARTO_ENABLED) +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") ++ set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin") + elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + else() +@@ -66,11 +62,9 @@ + + # validate our dependencies exist + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR +- RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR +- RSTUDIO_DEPENDENCIES_QUARTO_DIR) ++ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) ++ + +- + # skip quarto if not enabled + if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) + continue() diff --git a/nixpkgs/pkgs/applications/editors/setzer/default.nix b/nixpkgs/pkgs/applications/editors/setzer/default.nix index 55c98249dd36..640a00eaaa2c 100644 --- a/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "59"; + version = "60"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-PmkEOOi30Fa8VXNmKPvp6UAaw74MID9uTaCzXs9vPpk="; + hash = "sha256-SfMqGQKJtPTMSv4B70jOvTAIzNQc0AC16mum4fuNch4="; }; format = "other"; @@ -54,8 +54,10 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ bibtexparser + numpy pdfminer-six pexpect + pillow pycairo pygobject3 pyxdg diff --git a/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/nixpkgs/pkgs/applications/editors/standardnotes/src.json index ab59232d859e..59c79721a6ef 100644 --- a/nixpkgs/pkgs/applications/editors/standardnotes/src.json +++ b/nixpkgs/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.167.2", + "version": "3.173.4", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb", - "hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-amd64.deb", + "hash": "sha512-8GDzj7Xm61rF5xybLE74D4yMbT2HgEG0ez1gQio/qWtWSqY72+GSKWlCA+3wz8Mz2jThRDlka9s2fHBBUvG+fg==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb", - "hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-arm64.deb", + "hash": "sha512-yJ8yZK+RkPUzkjbscCXT5yv9BxeHGQsZsCrKwOJRdd/XbcVPnKWQm00JVZmMuz17d8rhm8Km/EW81JufZByM0Q==" } } } diff --git a/nixpkgs/pkgs/applications/editors/tecoc/default.nix b/nixpkgs/pkgs/applications/editors/tecoc/default.nix index 94889a13ef6d..778115dfbfa7 100644 --- a/nixpkgs/pkgs/applications/editors/tecoc/default.nix +++ b/nixpkgs/pkgs/applications/editors/tecoc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecoc"; - version = "unstable-2023-04-21"; + version = "unstable-2023-06-21"; src = fetchFromGitHub { owner = "blakemcbride"; repo = "TECOC"; - rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a"; - hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M="; + rev = "b4a96395a18c7e64ccaef0e25fdde3b7ef33ac4b"; + hash = "sha256-KTOGsTtxJh2sneU2VoDNUHcL3m8zt+3rBZTDvK1n02A="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix new file mode 100644 index 000000000000..5332e0b5d05b --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, fetchurl +, dpkg +, lib +, glib +, nss +, nspr +, at-spi2-atk +, cups +, dbus +, libdrm +, gtk3 +, pango +, cairo +, xorg +, libxkbcommon +, mesa +, expat +, alsa-lib +, buildFHSEnv +}: + +let + pname = "typora"; + version = "1.7.5"; + src = fetchurl { + url = "https://download.typora.io/linux/typora_${version}_amd64.deb"; + hash = "sha256-4Q+fx1kNu98+nxnI/7hLhE6zOdNsaAiAnW6xVd+hZOI="; + }; + + typoraBase = stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ dpkg ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share + mv usr/share $out + ln -s $out/share/typora/Typora $out/bin/Typora + runHook postInstall + ''; + }; + + typoraFHS = buildFHSEnv { + name = "typora-fhs"; + targetPkgs = pkgs: (with pkgs; [ + typoraBase + udev + alsa-lib + glib + nss + nspr + atk + cups + dbus + gtk3 + libdrm + pango + cairo + mesa + expat + libxkbcommon + ]) ++ (with pkgs.xorg; [ + libX11 + libXcursor + libXrandr + libXcomposite + libXdamage + libXext + libXfixes + libxcb + ]); + runScript = '' + Typora $* + ''; + }; + +in stdenv.mkDerivation { + inherit pname version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + ln -s ${typoraFHS}/bin/typora-fhs $out/bin/typora + ln -s ${typoraBase}/share/ $out + runHook postInstall + ''; + + meta = with lib; { + description = "A markdown editor, a markdown reader"; + homepage = "https://typora.io/"; + license = licenses.unfree; + maintainers = with maintainers; [ npulidomateo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/nixpkgs/pkgs/applications/editors/vim/macvim.nix index 8440d1fd6d9c..ce83128e98b1 100644 --- a/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation { description = "Vim - the text editor - for macOS"; homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; - maintainers = with maintainers; [ cstrahan lilyball ]; + maintainers = with maintainers; [ lilyball ]; platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 20641908115c..1611adc97ee3 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -16,8 +16,8 @@ rec { , namePrefix ? "vimplugin-" , src , unpackPhase ? "" - , configurePhase ? "" - , buildPhase ? "" + , configurePhase ? ":" + , buildPhase ? ":" , preInstall ? "" , postInstall ? "" , path ? "." @@ -48,9 +48,4 @@ rec { in addRtp (toVimPlugin drv); - buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ - # vim plugins may override this - buildPhase = ":"; - configurePhase = ":"; - } // attrs); } diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix index cf35e31736ee..e557cd7effe3 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix @@ -7,14 +7,14 @@ let inherit (vimUtils.override {inherit vim;}) - buildVimPluginFrom2Nix; + buildVimPlugin; inherit (lib) extends; initialPackages = self: { }; plugins = callPackage ./generated.nix { - inherit buildVimPluginFrom2Nix; + inherit buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; }; @@ -26,7 +26,7 @@ let # add to ./overrides.nix. overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; - inherit buildVimPluginFrom2Nix; + inherit buildVimPlugin; inherit llvmPackages luaPackages; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 40a7667ea1e0..ecd22ae6102b 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,9 +1,9 @@ # GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: +{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { - BetterLua-vim = buildVimPluginFrom2Nix { + BetterLua-vim = buildVimPlugin { pname = "BetterLua.vim"; version = "2020-08-14"; src = fetchFromGitHub { @@ -15,7 +15,7 @@ final: prev: meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; }; - BufOnly-vim = buildVimPluginFrom2Nix { + BufOnly-vim = buildVimPlugin { pname = "BufOnly.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -27,19 +27,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; - ChatGPT-nvim = buildVimPluginFrom2Nix { + ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2023-09-14"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "62443c9eb261e641d20af143357b157e3f542bb5"; - sha256 = "16mk5h1qgcr46w73dfq7lkh0428s0w4wbawplv94395wj92rmhnw"; + rev = "9f8062c7c40ec082c49f10e20818333a972b8063"; + sha256 = "0k8y48rrzqf8r1mbyi370grgxa28612qwm67mwsk3zhnm3496060"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; - CheckAttach = buildVimPluginFrom2Nix { + CheckAttach = buildVimPlugin { pname = "CheckAttach"; version = "2019-05-08"; src = fetchFromGitHub { @@ -51,7 +51,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; - Colour-Sampler-Pack = buildVimPluginFrom2Nix { + Colour-Sampler-Pack = buildVimPlugin { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; src = fetchFromGitHub { @@ -63,19 +63,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; }; - Coqtail = buildVimPluginFrom2Nix { + Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2023-08-05"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "dfe3939c9caff69d9af76bfd74f1a40fb7dc5609"; - sha256 = "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks"; + rev = "ac963d9dc54f175128aa31abc9a08c10ebef1ab3"; + sha256 = "05vzgn9lv6kkq81g31c9sc7bi5733x2jllzcm3vvk5mqzv3aczgp"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; - DoxygenToolkit-vim = buildVimPluginFrom2Nix { + DoxygenToolkit-vim = buildVimPlugin { pname = "DoxygenToolkit.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -87,7 +87,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; - FTerm-nvim = buildVimPluginFrom2Nix { + FTerm-nvim = buildVimPlugin { pname = "FTerm.nvim"; version = "2022-11-13"; src = fetchFromGitHub { @@ -99,7 +99,7 @@ final: prev: meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; - FixCursorHold-nvim = buildVimPluginFrom2Nix { + FixCursorHold-nvim = buildVimPlugin { pname = "FixCursorHold.nvim"; version = "2023-02-13"; src = fetchFromGitHub { @@ -111,7 +111,7 @@ final: prev: meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; - Improved-AnsiEsc = buildVimPluginFrom2Nix { + Improved-AnsiEsc = buildVimPlugin { pname = "Improved-AnsiEsc"; version = "2015-08-26"; src = fetchFromGitHub { @@ -123,7 +123,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; - Ionide-vim = buildVimPluginFrom2Nix { + Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; version = "2023-07-17"; src = fetchFromGitHub { @@ -135,7 +135,7 @@ final: prev: meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; - Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { + Jenkinsfile-vim-syntax = buildVimPlugin { pname = "Jenkinsfile-vim-syntax"; version = "2021-01-26"; src = fetchFromGitHub { @@ -147,7 +147,7 @@ final: prev: meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; - LanguageClient-neovim = buildVimPluginFrom2Nix { + LanguageClient-neovim = buildVimPlugin { pname = "LanguageClient-neovim"; version = "2022-06-07"; src = fetchFromGitHub { @@ -159,7 +159,7 @@ final: prev: meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; - LanguageTool-nvim = buildVimPluginFrom2Nix { + LanguageTool-nvim = buildVimPlugin { pname = "LanguageTool.nvim"; version = "2020-10-19"; src = fetchFromGitHub { @@ -171,31 +171,31 @@ final: prev: meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; }; - LazyVim = buildVimPluginFrom2Nix { + LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-09-04"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "a72a84972d85e5bbc6b9d60a0983b37efef21b8a"; - sha256 = "15j0aq3x8n22a7r5kw7mynch82527xgjlj4z03kzyrfwagnrnjf3"; + rev = "c711309a673a755652a90a080fd23dbab5dd61d5"; + sha256 = "1cyv4mhvysv8yrfp80kjnr56jd35rg4sb8bf72s1p8sx81ma3lc9"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; - LeaderF = buildVimPluginFrom2Nix { + LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-09-15"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "9c4451d2c1a6ea1f32e39fe52d58f6f5655b231d"; - sha256 = "1czr6nbwdba4m9yd1y892za5bkhx58m9svkz36g2blpma7cq65lw"; + rev = "2c85c8b160fb13d8af4fac3efbd6d48badf146cf"; + sha256 = "1z2y7pzk0fl8yphwsbfbdhhwcj2xlzn9bwfmrdqhjs9p722mqgjn"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; - MatchTagAlways = buildVimPluginFrom2Nix { + MatchTagAlways = buildVimPlugin { pname = "MatchTagAlways"; version = "2017-05-20"; src = fetchFromGitHub { @@ -207,7 +207,7 @@ final: prev: meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; }; - Navigator-nvim = buildVimPluginFrom2Nix { + Navigator-nvim = buildVimPlugin { pname = "Navigator.nvim"; version = "2023-02-02"; src = fetchFromGitHub { @@ -219,7 +219,7 @@ final: prev: meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; - NeoSolarized = buildVimPluginFrom2Nix { + NeoSolarized = buildVimPlugin { pname = "NeoSolarized"; version = "2020-08-07"; src = fetchFromGitHub { @@ -231,7 +231,7 @@ final: prev: meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; - NrrwRgn = buildVimPluginFrom2Nix { + NrrwRgn = buildVimPlugin { pname = "NrrwRgn"; version = "2022-02-13"; src = fetchFromGitHub { @@ -243,7 +243,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; - PreserveNoEOL = buildVimPluginFrom2Nix { + PreserveNoEOL = buildVimPlugin { pname = "PreserveNoEOL"; version = "2013-06-14"; src = fetchFromGitHub { @@ -255,7 +255,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; - QFEnter = buildVimPluginFrom2Nix { + QFEnter = buildVimPlugin { pname = "QFEnter"; version = "2022-10-15"; src = fetchFromGitHub { @@ -267,7 +267,7 @@ final: prev: meta.homepage = "https://github.com/yssl/QFEnter/"; }; - Recover-vim = buildVimPluginFrom2Nix { + Recover-vim = buildVimPlugin { pname = "Recover.vim"; version = "2022-09-07"; src = fetchFromGitHub { @@ -279,7 +279,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; - Rename = buildVimPluginFrom2Nix { + Rename = buildVimPlugin { pname = "Rename"; version = "2011-08-31"; src = fetchFromGitHub { @@ -291,7 +291,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Rename/"; }; - ReplaceWithRegister = buildVimPluginFrom2Nix { + ReplaceWithRegister = buildVimPlugin { pname = "ReplaceWithRegister"; version = "2014-10-31"; src = fetchFromGitHub { @@ -303,19 +303,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; - SchemaStore-nvim = buildVimPluginFrom2Nix { + SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-09-15"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "2a6a5d3e2bc8a5727b6d083d2920d12a392ed05b"; - sha256 = "097nqimjz2c5g0rsbbvp36haga334sfrlpqvfwwp8zyxxkgh7n77"; + rev = "847f69b4bd50ad09c7d66943bc690682a3e35573"; + sha256 = "0jg3hdw26s8bmfirdi2nbchkmkakmggl0h5x2jx7hn5d9yn3ps4h"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; - Shade-nvim = buildVimPluginFrom2Nix { + Shade-nvim = buildVimPlugin { pname = "Shade.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -327,7 +327,7 @@ final: prev: meta.homepage = "https://github.com/sunjon/Shade.nvim/"; }; - ShowMultiBase = buildVimPluginFrom2Nix { + ShowMultiBase = buildVimPlugin { pname = "ShowMultiBase"; version = "2010-10-18"; src = fetchFromGitHub { @@ -339,7 +339,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; - SimpylFold = buildVimPluginFrom2Nix { + SimpylFold = buildVimPlugin { pname = "SimpylFold"; version = "2022-05-02"; src = fetchFromGitHub { @@ -351,7 +351,7 @@ final: prev: meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; - SmartCase = buildVimPluginFrom2Nix { + SmartCase = buildVimPlugin { pname = "SmartCase"; version = "2010-10-18"; src = fetchFromGitHub { @@ -363,7 +363,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/SmartCase/"; }; - SpaceCamp = buildVimPluginFrom2Nix { + SpaceCamp = buildVimPlugin { pname = "SpaceCamp"; version = "2023-08-25"; src = fetchFromGitHub { @@ -375,19 +375,19 @@ final: prev: meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; - SpaceVim = buildVimPluginFrom2Nix { + SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2023-09-16"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "92395fbeae1ba673aa618e673e731cefa0effa5b"; - sha256 = "10rhrxq866rlkbh24c5khnk6lkm78370smd6dph4pa5mrx6dbqjn"; + rev = "f7151f55a9e9b96e332d7cc1e0febdcae6198356"; + sha256 = "155d7b0vgqcsdayry8gz7sz2l3wlabh1pp6jksanjbfcq3gydvxn"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; - SudoEdit-vim = buildVimPluginFrom2Nix { + SudoEdit-vim = buildVimPlugin { pname = "SudoEdit.vim"; version = "2023-04-25"; src = fetchFromGitHub { @@ -399,7 +399,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; }; - VimOrganizer = buildVimPluginFrom2Nix { + VimOrganizer = buildVimPlugin { pname = "VimOrganizer"; version = "2020-12-15"; src = fetchFromGitHub { @@ -411,7 +411,7 @@ final: prev: meta.homepage = "https://github.com/hsitz/VimOrganizer/"; }; - Vundle-vim = buildVimPluginFrom2Nix { + Vundle-vim = buildVimPlugin { pname = "Vundle.vim"; version = "2023-08-19"; src = fetchFromGitHub { @@ -423,7 +423,7 @@ final: prev: meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; - YUNOcommit-vim = buildVimPluginFrom2Nix { + YUNOcommit-vim = buildVimPlugin { pname = "YUNOcommit.vim"; version = "2014-11-26"; src = fetchFromGitHub { @@ -435,7 +435,7 @@ final: prev: meta.homepage = "https://github.com/esneider/YUNOcommit.vim/"; }; - YankRing-vim = buildVimPluginFrom2Nix { + YankRing-vim = buildVimPlugin { pname = "YankRing.vim"; version = "2015-07-29"; src = fetchFromGitHub { @@ -447,20 +447,20 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; }; - YouCompleteMe = buildVimPluginFrom2Nix { + YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2023-09-14"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "91ee858de446a150c10cf2aacaeed90db9235880"; - sha256 = "08qhz4c5kl8y1r5ikk5174y738fai1s3s6sy114f2fmggx8130nq"; + rev = "cc9a3ae3efdcc7d038aab0620ea28882533c236c"; + sha256 = "1q5mcqyim7gjc6hr792a7q8xbng7yvr6ynwicz6wn14q05s6lwpq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; }; - a-vim = buildVimPluginFrom2Nix { + a-vim = buildVimPlugin { pname = "a.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -472,7 +472,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/a.vim/"; }; - ack-vim = buildVimPluginFrom2Nix { + ack-vim = buildVimPlugin { pname = "ack.vim"; version = "2018-02-27"; src = fetchFromGitHub { @@ -484,7 +484,7 @@ final: prev: meta.homepage = "https://github.com/mileszs/ack.vim/"; }; - acp = buildVimPluginFrom2Nix { + acp = buildVimPlugin { pname = "acp"; version = "2013-02-05"; src = fetchFromGitHub { @@ -496,7 +496,7 @@ final: prev: meta.homepage = "https://github.com/eikenb/acp/"; }; - actions-preview-nvim = buildVimPluginFrom2Nix { + actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; version = "2023-08-23"; src = fetchFromGitHub { @@ -508,7 +508,7 @@ final: prev: meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; - adwaita-nvim = buildVimPluginFrom2Nix { + adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; version = "2023-06-22"; src = fetchFromGitHub { @@ -520,20 +520,20 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; }; - aerial-nvim = buildVimPluginFrom2Nix { + aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-09-16"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "bed048ddef3e7b7fd992bc3a28c413aaa25d63de"; - sha256 = "08x46r1k87wrf8bdlbzbnv4czrn4qq1hp7apl7q13gmp1dyf3llm"; + rev = "ffdda791c0d739154a73af09e4ed14c9147a354b"; + sha256 = "0v9p62znlk17jx0i9c65dcz651q0p4a7fkfriv96hjqxih560sl6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; - ag-nvim = buildVimPluginFrom2Nix { + ag-nvim = buildVimPlugin { pname = "ag.nvim"; version = "2021-07-15"; src = fetchFromGitHub { @@ -545,7 +545,7 @@ final: prev: meta.homepage = "https://github.com/Numkil/ag.nvim/"; }; - agda-vim = buildVimPluginFrom2Nix { + agda-vim = buildVimPlugin { pname = "agda-vim"; version = "2021-10-28"; src = fetchFromGitHub { @@ -557,19 +557,19 @@ final: prev: meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; - ai-vim = buildVimPluginFrom2Nix { + ai-vim = buildVimPlugin { pname = "ai.vim"; - version = "2023-04-05"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "17a61d5bd8b84791b7db6757abefb763f98a4fd1"; - sha256 = "0jnycmfmml8ba345s76wh4nrlf5jb5pmpyl5l2sg9fyqw2lz5r36"; + rev = "489d2c1b1e5373d7da7e50ba189b289a375c2034"; + sha256 = "04jhp7hd2r2gmaqglnll08qcdi7jymkjpwmq532xvxxyji53zbv1"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; - alchemist-vim = buildVimPluginFrom2Nix { + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "2023-09-01"; src = fetchFromGitHub { @@ -581,19 +581,19 @@ final: prev: meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; - ale = buildVimPluginFrom2Nix { + ale = buildVimPlugin { pname = "ale"; - version = "2023-09-16"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "cf270a1adadff2fa8b2931940ef8192b975f1ee4"; - sha256 = "1pbfb2jp6ygwy3k22aihsdshh5nr0bz0s5n596nn9b875l5q3fzc"; + rev = "53b01d6a546384a28f1ccbed41baae58d7341da4"; + sha256 = "1jqsxgys7285m99y553ydvf0cwdkm98s0mi6mnmghzv3q7d9ngik"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; - align = buildVimPluginFrom2Nix { + align = buildVimPlugin { pname = "align"; version = "2012-08-08"; src = fetchFromGitHub { @@ -605,7 +605,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/align/"; }; - alpha-nvim = buildVimPluginFrom2Nix { + alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -617,7 +617,7 @@ final: prev: meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; - aniseed = buildVimPluginFrom2Nix { + aniseed = buildVimPlugin { pname = "aniseed"; version = "2023-07-06"; src = fetchFromGitHub { @@ -629,7 +629,7 @@ final: prev: meta.homepage = "https://github.com/Olical/aniseed/"; }; - ansible-vim = buildVimPluginFrom2Nix { + ansible-vim = buildVimPlugin { pname = "ansible-vim"; version = "2022-02-11"; src = fetchFromGitHub { @@ -641,7 +641,7 @@ final: prev: meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; - antonys-macro-repeater = buildVimPluginFrom2Nix { + antonys-macro-repeater = buildVimPlugin { pname = "antonys-macro-repeater"; version = "2017-09-10"; src = fetchFromGitHub { @@ -653,7 +653,7 @@ final: prev: meta.homepage = "https://github.com/ckarnell/antonys-macro-repeater/"; }; - arcanist-vim = buildVimPluginFrom2Nix { + arcanist-vim = buildVimPlugin { pname = "arcanist.vim"; version = "2016-05-27"; src = fetchFromGitHub { @@ -665,7 +665,7 @@ final: prev: meta.homepage = "https://github.com/solarnz/arcanist.vim/"; }; - argtextobj-vim = buildVimPluginFrom2Nix { + argtextobj-vim = buildVimPlugin { pname = "argtextobj.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -677,7 +677,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; - async-vim = buildVimPluginFrom2Nix { + async-vim = buildVimPlugin { pname = "async.vim"; version = "2022-04-04"; src = fetchFromGitHub { @@ -689,7 +689,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; - asyncomplete-buffer-vim = buildVimPluginFrom2Nix { + asyncomplete-buffer-vim = buildVimPlugin { pname = "asyncomplete-buffer.vim"; version = "2020-06-26"; src = fetchFromGitHub { @@ -701,7 +701,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-buffer.vim/"; }; - asyncomplete-file-vim = buildVimPluginFrom2Nix { + asyncomplete-file-vim = buildVimPlugin { pname = "asyncomplete-file.vim"; version = "2022-07-11"; src = fetchFromGitHub { @@ -713,7 +713,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-file.vim/"; }; - asyncomplete-lsp-vim = buildVimPluginFrom2Nix { + asyncomplete-lsp-vim = buildVimPlugin { pname = "asyncomplete-lsp.vim"; version = "2022-11-21"; src = fetchFromGitHub { @@ -725,7 +725,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; }; - asyncomplete-omni-vim = buildVimPluginFrom2Nix { + asyncomplete-omni-vim = buildVimPlugin { pname = "asyncomplete-omni.vim"; version = "2018-04-04"; src = fetchFromGitHub { @@ -737,7 +737,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-omni.vim/"; }; - asyncomplete-tags-vim = buildVimPluginFrom2Nix { + asyncomplete-tags-vim = buildVimPlugin { pname = "asyncomplete-tags.vim"; version = "2021-04-29"; src = fetchFromGitHub { @@ -749,7 +749,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-tags.vim/"; }; - asyncomplete-ultisnips-vim = buildVimPluginFrom2Nix { + asyncomplete-ultisnips-vim = buildVimPlugin { pname = "asyncomplete-ultisnips.vim"; version = "2023-01-13"; src = fetchFromGitHub { @@ -761,7 +761,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/"; }; - asyncomplete-vim = buildVimPluginFrom2Nix { + asyncomplete-vim = buildVimPlugin { pname = "asyncomplete.vim"; version = "2023-04-11"; src = fetchFromGitHub { @@ -773,31 +773,31 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; - asyncrun-vim = buildVimPluginFrom2Nix { + asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2023-08-20"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "42385d54b8546c163b946fd50eed2103ef7993c9"; - sha256 = "1brqg6315z4rwsjv28yf86lynzshzpwxys248mpfzyhkz5jfad1y"; + rev = "61cc3081963a12048e00e89f8cedc8bd1cb83b8c"; + sha256 = "1l86kk0ha6yw3i285xaizzrgxvnxf95q0ys44glz8mns1z2jq4zk"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; - asynctasks-vim = buildVimPluginFrom2Nix { + asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2023-09-16"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "15daa3b70b2b8b78cfbf04dd070b962ab1283406"; - sha256 = "1cwn0fbf0xh7zp7v13qbpfx1hyvy7m9ixn8wxwyrqzx5xhf6xj3j"; + rev = "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3"; + sha256 = "0bvchmk1pdfjmyidf393chmc17y0v6zq92p3ac7dpwyiz01c360l"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; - ats-vim = buildVimPluginFrom2Nix { + ats-vim = buildVimPlugin { pname = "ats-vim"; version = "2020-09-04"; src = fetchFromGitHub { @@ -809,19 +809,19 @@ final: prev: meta.homepage = "https://github.com/vmchale/ats-vim/"; }; - aurora = buildVimPluginFrom2Nix { + aurora = buildVimPlugin { pname = "aurora"; - version = "2023-09-09"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "2ff7e8d4f7fcf8bfb4e05280049c390d71371869"; - sha256 = "0g7k0r1lfkw3km6drcv6zy29yjhc0szqlhjxrp5zdps186fx50hj"; + rev = "3fc8e5a30e7cdbabb34f5e18865c4d1c38755308"; + sha256 = "1jjjf4zy3mgmcfpjddjdf1c1vy3w0hz7akjk7m08wvclq16l8773"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; - auto-git-diff = buildVimPluginFrom2Nix { + auto-git-diff = buildVimPlugin { pname = "auto-git-diff"; version = "2022-10-29"; src = fetchFromGitHub { @@ -833,7 +833,7 @@ final: prev: meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/"; }; - auto-hlsearch-nvim = buildVimPluginFrom2Nix { + auto-hlsearch-nvim = buildVimPlugin { pname = "auto-hlsearch.nvim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -845,7 +845,7 @@ final: prev: meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/"; }; - auto-pairs = buildVimPluginFrom2Nix { + auto-pairs = buildVimPlugin { pname = "auto-pairs"; version = "2019-02-27"; src = fetchFromGitHub { @@ -857,7 +857,7 @@ final: prev: meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; - auto-save-nvim = buildVimPluginFrom2Nix { + auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; version = "2022-11-01"; src = fetchFromGitHub { @@ -869,7 +869,7 @@ final: prev: meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; }; - auto-session = buildVimPluginFrom2Nix { + auto-session = buildVimPlugin { pname = "auto-session"; version = "2023-08-29"; src = fetchFromGitHub { @@ -881,7 +881,7 @@ final: prev: meta.homepage = "https://github.com/rmagatti/auto-session/"; }; - autoclose-nvim = buildVimPluginFrom2Nix { + autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -893,7 +893,7 @@ final: prev: meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; - autoload_cscope-vim = buildVimPluginFrom2Nix { + autoload_cscope-vim = buildVimPlugin { pname = "autoload_cscope.vim"; version = "2011-01-28"; src = fetchFromGitHub { @@ -905,7 +905,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; - autosave-nvim = buildVimPluginFrom2Nix { + autosave-nvim = buildVimPlugin { pname = "autosave.nvim"; version = "2022-10-13"; src = fetchFromGitHub { @@ -917,7 +917,7 @@ final: prev: meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; }; - awesome-vim-colorschemes = buildVimPluginFrom2Nix { + awesome-vim-colorschemes = buildVimPlugin { pname = "awesome-vim-colorschemes"; version = "2023-05-06"; src = fetchFromGitHub { @@ -929,7 +929,7 @@ final: prev: meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; - ayu-vim = buildVimPluginFrom2Nix { + ayu-vim = buildVimPlugin { pname = "ayu-vim"; version = "2020-05-29"; src = fetchFromGitHub { @@ -941,7 +941,7 @@ final: prev: meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; - b64-nvim = buildVimPluginFrom2Nix { + b64-nvim = buildVimPlugin { pname = "b64.nvim"; version = "2023-04-12"; src = fetchFromGitHub { @@ -953,7 +953,7 @@ final: prev: meta.homepage = "https://github.com/taybart/b64.nvim/"; }; - barbar-nvim = buildVimPluginFrom2Nix { + barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -965,7 +965,7 @@ final: prev: meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; - barbecue-nvim = buildVimPluginFrom2Nix { + barbecue-nvim = buildVimPlugin { pname = "barbecue.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -977,7 +977,7 @@ final: prev: meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; - base16-vim = buildVimPluginFrom2Nix { + base16-vim = buildVimPlugin { pname = "base16-vim"; version = "2022-09-20"; src = fetchFromGitHub { @@ -989,19 +989,19 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; - base46 = buildVimPluginFrom2Nix { + base46 = buildVimPlugin { pname = "base46"; - version = "2023-09-14"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "fc7aafe0d0348323d3fd41689cde95af86d4c7ba"; - sha256 = "0b0r9hf7a7a4ipsqcc7q97ijk8p5a9lq9kqh93a92kq1x2qhlf2j"; + rev = "97d08b861cf69a4eeb63a7fa748a4392d0fca089"; + sha256 = "094gkjilrd8y8x9hnw69bxa84z8q6wr3hb8q4hcfql1sirzjsbk7"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; - bat-vim = buildVimPluginFrom2Nix { + bat-vim = buildVimPlugin { pname = "bat.vim"; version = "2022-11-14"; src = fetchFromGitHub { @@ -1013,7 +1013,7 @@ final: prev: meta.homepage = "https://github.com/jamespwilliams/bat.vim/"; }; - bats-vim = buildVimPluginFrom2Nix { + bats-vim = buildVimPlugin { pname = "bats.vim"; version = "2013-07-03"; src = fetchFromGitHub { @@ -1025,7 +1025,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/bats.vim/"; }; - bclose-vim = buildVimPluginFrom2Nix { + bclose-vim = buildVimPlugin { pname = "bclose.vim"; version = "2018-10-10"; src = fetchFromGitHub { @@ -1037,7 +1037,7 @@ final: prev: meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; - better-escape-nvim = buildVimPluginFrom2Nix { + better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; version = "2023-05-02"; src = fetchFromGitHub { @@ -1049,7 +1049,7 @@ final: prev: meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; - bigfile-nvim = buildVimPluginFrom2Nix { + bigfile-nvim = buildVimPlugin { pname = "bigfile.nvim"; version = "2023-06-28"; src = fetchFromGitHub { @@ -1061,31 +1061,31 @@ final: prev: meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; - blamer-nvim = buildVimPluginFrom2Nix { + blamer-nvim = buildVimPlugin { pname = "blamer.nvim"; - version = "2021-11-17"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "APZelos"; repo = "blamer.nvim"; - rev = "f4eb22a9013642c411725fdda945ae45f8d93181"; - sha256 = "1czjagkfjw57f2nvjjgbma1gcy1ylcd68dyfc5ivr2wc6fdw5lks"; + rev = "e0d43c11697300eb68f00d69df8b87deb0bf52dc"; + sha256 = "1r88z0320lsv1q0bhnf8hgzi2qp1a6s1fb198zypc5m0kf410n3v"; }; meta.homepage = "https://github.com/APZelos/blamer.nvim/"; }; - block-nvim = buildVimPluginFrom2Nix { + block-nvim = buildVimPlugin { pname = "block.nvim"; - version = "2023-06-22"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "HampusHauffman"; repo = "block.nvim"; - rev = "a7739f9703adf9e77b42a331d4998bd5c8cbf1e9"; - sha256 = "0wvkyczxjgi701bnhw5fxzwprgsx26nbq13mi3qqlyh42nhhm8zq"; + rev = "6fb969ab12579e58b9379aa51933cad4a466cf75"; + sha256 = "10l9liw5cag4gq281gx8px634b7jamm71kakn36v96vdnyrbia3n"; }; meta.homepage = "https://github.com/HampusHauffman/block.nvim/"; }; - blueballs-neovim = buildVimPluginFrom2Nix { + blueballs-neovim = buildVimPlugin { pname = "blueballs-neovim"; version = "2021-11-28"; src = fetchFromGitHub { @@ -1097,7 +1097,7 @@ final: prev: meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; - boole-nvim = buildVimPluginFrom2Nix { + boole-nvim = buildVimPlugin { pname = "boole.nvim"; version = "2023-07-08"; src = fetchFromGitHub { @@ -1109,7 +1109,7 @@ final: prev: meta.homepage = "https://github.com/nat-418/boole.nvim/"; }; - bracey-vim = buildVimPluginFrom2Nix { + bracey-vim = buildVimPlugin { pname = "bracey.vim"; version = "2021-08-20"; src = fetchFromGitHub { @@ -1121,7 +1121,7 @@ final: prev: meta.homepage = "https://github.com/turbio/bracey.vim/"; }; - brainfuck-vim = buildVimPluginFrom2Nix { + brainfuck-vim = buildVimPlugin { pname = "brainfuck-vim"; version = "2021-01-28"; src = fetchFromGitHub { @@ -1133,7 +1133,7 @@ final: prev: meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; - bufdelete-nvim = buildVimPluginFrom2Nix { + bufdelete-nvim = buildVimPlugin { pname = "bufdelete.nvim"; version = "2023-06-29"; src = fetchFromGitHub { @@ -1145,7 +1145,7 @@ final: prev: meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; - bufexplorer = buildVimPluginFrom2Nix { + bufexplorer = buildVimPlugin { pname = "bufexplorer"; version = "2023-05-02"; src = fetchFromGitHub { @@ -1157,7 +1157,7 @@ final: prev: meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; - bufferize-vim = buildVimPluginFrom2Nix { + bufferize-vim = buildVimPlugin { pname = "bufferize.vim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -1169,19 +1169,19 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; }; - bufferline-nvim = buildVimPluginFrom2Nix { + bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-08-29"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "9961d87bb3ec008213c46ba14b3f384a5f520eb5"; - sha256 = "0g521d6ngl7wajipqpksarxld0pwdk7878yjw64j7lc6p80si3js"; + rev = "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3"; + sha256 = "0n99bshmyhzq4kg35gx9x3wpfyfji1ddlg66f11vgwaprsibi22a"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; - bufjump-nvim = buildVimPluginFrom2Nix { + bufjump-nvim = buildVimPlugin { pname = "bufjump.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -1193,7 +1193,7 @@ final: prev: meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/"; }; - bullets-vim = buildVimPluginFrom2Nix { + bullets-vim = buildVimPlugin { pname = "bullets.vim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -1205,7 +1205,7 @@ final: prev: meta.homepage = "https://github.com/dkarter/bullets.vim/"; }; - calendar-vim = buildVimPluginFrom2Nix { + calendar-vim = buildVimPlugin { pname = "calendar.vim"; version = "2023-03-02"; src = fetchFromGitHub { @@ -1217,7 +1217,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; - camelcasemotion = buildVimPluginFrom2Nix { + camelcasemotion = buildVimPlugin { pname = "camelcasemotion"; version = "2019-12-02"; src = fetchFromGitHub { @@ -1229,7 +1229,7 @@ final: prev: meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; - caw-vim = buildVimPluginFrom2Nix { + caw-vim = buildVimPlugin { pname = "caw.vim"; version = "2023-03-16"; src = fetchFromGitHub { @@ -1241,31 +1241,31 @@ final: prev: meta.homepage = "https://github.com/tyru/caw.vim/"; }; - ccc-nvim = buildVimPluginFrom2Nix { + ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-06-12"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6"; - sha256 = "1qm3dp7w2rqnyvgsrn0j7s14nw2a1z7dfhyawkvzslsv6z4z4njg"; + rev = "cd2a10557b4a13e80929f59a7076ae792b2c60fa"; + sha256 = "0mfzxb9xw325b3li077qd23gys9j66jhpyz2dd9kz2xya7jvl6rb"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; - chadtree = buildVimPluginFrom2Nix { + chadtree = buildVimPlugin { pname = "chadtree"; - version = "2023-09-05"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "2bf3d1fc5b53da1ba681676c9cb3431f03f9f497"; - sha256 = "09623pff0h2zx5n2mg21jfdcl6c6f5jsdpv2gxg70mmrrhlrm9xx"; + rev = "f205444ad5666c5fe47f5d6248351a9fe7af574b"; + sha256 = "1rc68r9nx4nycnbl4pqr7lh31wv5xzrx34swsk191qkxl0fvzx2b"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; - changeColorScheme-vim = buildVimPluginFrom2Nix { + changeColorScheme-vim = buildVimPlugin { pname = "changeColorScheme.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -1277,7 +1277,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; }; - cheatsheet-nvim = buildVimPluginFrom2Nix { + cheatsheet-nvim = buildVimPlugin { pname = "cheatsheet.nvim"; version = "2021-12-23"; src = fetchFromGitHub { @@ -1289,7 +1289,7 @@ final: prev: meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/"; }; - ci_dark = buildVimPluginFrom2Nix { + ci_dark = buildVimPlugin { pname = "ci_dark"; version = "2022-03-27"; src = fetchFromGitHub { @@ -1301,7 +1301,7 @@ final: prev: meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; - circles-nvim = buildVimPluginFrom2Nix { + circles-nvim = buildVimPlugin { pname = "circles.nvim"; version = "2023-04-08"; src = fetchFromGitHub { @@ -1313,7 +1313,7 @@ final: prev: meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; - clang_complete = buildVimPluginFrom2Nix { + clang_complete = buildVimPlugin { pname = "clang_complete"; version = "2022-11-30"; src = fetchFromGitHub { @@ -1325,19 +1325,19 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; - clangd_extensions-nvim = buildVimPluginFrom2Nix { + clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2023-09-08"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "bafed83f79b5779f5b43e8e015e13ca99dcd8b3a"; - sha256 = "0v703kl34a6cx863m1ah347bg3fk06mr0780cxnz547dpc8dddbm"; + rev = "34c8eaa12be192e83cd4865ce2375e9f53e728f2"; + sha256 = "0jfbx2a8yfnp8k1x1c003f1mpvi05kaydla8y07h0lm3nlkdbvr3"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; - clever-f-vim = buildVimPluginFrom2Nix { + clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; src = fetchFromGitHub { @@ -1349,7 +1349,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/clever-f.vim/"; }; - clighter8 = buildVimPluginFrom2Nix { + clighter8 = buildVimPlugin { pname = "clighter8"; version = "2018-07-25"; src = fetchFromGitHub { @@ -1361,7 +1361,7 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; - clipboard-image-nvim = buildVimPluginFrom2Nix { + clipboard-image-nvim = buildVimPlugin { pname = "clipboard-image.nvim"; version = "2022-11-10"; src = fetchFromGitHub { @@ -1373,7 +1373,7 @@ final: prev: meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/"; }; - close-buffers-vim = buildVimPluginFrom2Nix { + close-buffers-vim = buildVimPlugin { pname = "close-buffers.vim"; version = "2020-09-23"; src = fetchFromGitHub { @@ -1385,7 +1385,7 @@ final: prev: meta.homepage = "https://github.com/asheq/close-buffers.vim/"; }; - cmd-parser-nvim = buildVimPluginFrom2Nix { + cmd-parser-nvim = buildVimPlugin { pname = "cmd-parser.nvim"; version = "2022-02-23"; src = fetchFromGitHub { @@ -1397,7 +1397,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; - cmp-async-path = buildVimPluginFrom2Nix { + cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; version = "2023-01-16"; src = fetchFromGitHub { @@ -1409,7 +1409,7 @@ final: prev: meta.homepage = "https://github.com/FelipeLema/cmp-async-path/"; }; - cmp-beancount = buildVimPluginFrom2Nix { + cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; version = "2022-11-27"; src = fetchFromGitHub { @@ -1421,7 +1421,7 @@ final: prev: meta.homepage = "https://github.com/crispgm/cmp-beancount/"; }; - cmp-buffer = buildVimPluginFrom2Nix { + cmp-buffer = buildVimPlugin { pname = "cmp-buffer"; version = "2022-08-10"; src = fetchFromGitHub { @@ -1433,7 +1433,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; - cmp-calc = buildVimPluginFrom2Nix { + cmp-calc = buildVimPlugin { pname = "cmp-calc"; version = "2023-08-18"; src = fetchFromGitHub { @@ -1445,7 +1445,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; - cmp-clippy = buildVimPluginFrom2Nix { + cmp-clippy = buildVimPlugin { pname = "cmp-clippy"; version = "2023-02-08"; src = fetchFromGitHub { @@ -1457,7 +1457,7 @@ final: prev: meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; - cmp-cmdline = buildVimPluginFrom2Nix { + cmp-cmdline = buildVimPlugin { pname = "cmp-cmdline"; version = "2023-06-08"; src = fetchFromGitHub { @@ -1469,7 +1469,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; - cmp-cmdline-history = buildVimPluginFrom2Nix { + cmp-cmdline-history = buildVimPlugin { pname = "cmp-cmdline-history"; version = "2022-05-04"; src = fetchFromGitHub { @@ -1481,7 +1481,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/"; }; - cmp-conjure = buildVimPluginFrom2Nix { + cmp-conjure = buildVimPlugin { pname = "cmp-conjure"; version = "2023-06-22"; src = fetchFromGitHub { @@ -1493,7 +1493,7 @@ final: prev: meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; - cmp-conventionalcommits = buildVimPluginFrom2Nix { + cmp-conventionalcommits = buildVimPlugin { pname = "cmp-conventionalcommits"; version = "2022-10-16"; src = fetchFromGitHub { @@ -1505,7 +1505,7 @@ final: prev: meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/"; }; - cmp-copilot = buildVimPluginFrom2Nix { + cmp-copilot = buildVimPlugin { pname = "cmp-copilot"; version = "2022-04-11"; src = fetchFromGitHub { @@ -1517,7 +1517,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-copilot/"; }; - cmp-dap = buildVimPluginFrom2Nix { + cmp-dap = buildVimPlugin { pname = "cmp-dap"; version = "2022-11-13"; src = fetchFromGitHub { @@ -1529,7 +1529,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; - cmp-dictionary = buildVimPluginFrom2Nix { + cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; version = "2023-08-30"; src = fetchFromGitHub { @@ -1541,7 +1541,7 @@ final: prev: meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; - cmp-digraphs = buildVimPluginFrom2Nix { + cmp-digraphs = buildVimPlugin { pname = "cmp-digraphs"; version = "2021-12-13"; src = fetchFromGitHub { @@ -1553,7 +1553,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-digraphs/"; }; - cmp-emoji = buildVimPluginFrom2Nix { + cmp-emoji = buildVimPlugin { pname = "cmp-emoji"; version = "2021-09-28"; src = fetchFromGitHub { @@ -1565,7 +1565,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; - cmp-fish = buildVimPluginFrom2Nix { + cmp-fish = buildVimPlugin { pname = "cmp-fish"; version = "2022-09-01"; src = fetchFromGitHub { @@ -1577,7 +1577,7 @@ final: prev: meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; }; - cmp-fuzzy-buffer = buildVimPluginFrom2Nix { + cmp-fuzzy-buffer = buildVimPlugin { pname = "cmp-fuzzy-buffer"; version = "2023-04-02"; src = fetchFromGitHub { @@ -1589,7 +1589,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; - cmp-fuzzy-path = buildVimPluginFrom2Nix { + cmp-fuzzy-path = buildVimPlugin { pname = "cmp-fuzzy-path"; version = "2023-06-18"; src = fetchFromGitHub { @@ -1601,7 +1601,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; - cmp-git = buildVimPluginFrom2Nix { + cmp-git = buildVimPlugin { pname = "cmp-git"; version = "2023-05-30"; src = fetchFromGitHub { @@ -1613,7 +1613,7 @@ final: prev: meta.homepage = "https://github.com/petertriho/cmp-git/"; }; - cmp-greek = buildVimPluginFrom2Nix { + cmp-greek = buildVimPlugin { pname = "cmp-greek"; version = "2022-01-10"; src = fetchFromGitHub { @@ -1625,7 +1625,7 @@ final: prev: meta.homepage = "https://github.com/max397574/cmp-greek/"; }; - cmp-latex-symbols = buildVimPluginFrom2Nix { + cmp-latex-symbols = buildVimPlugin { pname = "cmp-latex-symbols"; version = "2023-01-23"; src = fetchFromGitHub { @@ -1637,7 +1637,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; - cmp-look = buildVimPluginFrom2Nix { + cmp-look = buildVimPlugin { pname = "cmp-look"; version = "2022-06-26"; src = fetchFromGitHub { @@ -1649,7 +1649,7 @@ final: prev: meta.homepage = "https://github.com/octaltree/cmp-look/"; }; - cmp-neosnippet = buildVimPluginFrom2Nix { + cmp-neosnippet = buildVimPlugin { pname = "cmp-neosnippet"; version = "2022-01-06"; src = fetchFromGitHub { @@ -1661,7 +1661,7 @@ final: prev: meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; }; - cmp-npm = buildVimPluginFrom2Nix { + cmp-npm = buildVimPlugin { pname = "cmp-npm"; version = "2023-06-12"; src = fetchFromGitHub { @@ -1673,7 +1673,7 @@ final: prev: meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; - cmp-nvim-lsp = buildVimPluginFrom2Nix { + cmp-nvim-lsp = buildVimPlugin { pname = "cmp-nvim-lsp"; version = "2023-06-23"; src = fetchFromGitHub { @@ -1685,7 +1685,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; - cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { + cmp-nvim-lsp-document-symbol = buildVimPlugin { pname = "cmp-nvim-lsp-document-symbol"; version = "2023-04-01"; src = fetchFromGitHub { @@ -1697,7 +1697,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; - cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { + cmp-nvim-lsp-signature-help = buildVimPlugin { pname = "cmp-nvim-lsp-signature-help"; version = "2023-02-03"; src = fetchFromGitHub { @@ -1709,7 +1709,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; - cmp-nvim-lua = buildVimPluginFrom2Nix { + cmp-nvim-lua = buildVimPlugin { pname = "cmp-nvim-lua"; version = "2023-04-14"; src = fetchFromGitHub { @@ -1721,7 +1721,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; - cmp-nvim-tags = buildVimPluginFrom2Nix { + cmp-nvim-tags = buildVimPlugin { pname = "cmp-nvim-tags"; version = "2023-05-10"; src = fetchFromGitHub { @@ -1733,7 +1733,7 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; }; - cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + cmp-nvim-ultisnips = buildVimPlugin { pname = "cmp-nvim-ultisnips"; version = "2023-07-05"; src = fetchFromGitHub { @@ -1745,19 +1745,19 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; - cmp-omni = buildVimPluginFrom2Nix { + cmp-omni = buildVimPlugin { pname = "cmp-omni"; - version = "2023-05-25"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-omni"; - rev = "9436e6cdd7c5dfa24a99a60d9280b24dbdea3649"; - sha256 = "0jypzs5y9pq55db5jkmvshlx4lzi82mxcfr53nsb0nd3xr38ywxd"; + rev = "4ef610bbd85a5ee4e97e09450c0daecbdc60de86"; + sha256 = "17963f45rly6p4jl47v7dsvqc02wj36mq7qx5mkmzqmrpwcrj81z"; }; meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; - cmp-pandoc-references = buildVimPluginFrom2Nix { + cmp-pandoc-references = buildVimPlugin { pname = "cmp-pandoc-references"; version = "2022-04-20"; src = fetchFromGitHub { @@ -1769,7 +1769,7 @@ final: prev: meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; - cmp-pandoc-nvim = buildVimPluginFrom2Nix { + cmp-pandoc-nvim = buildVimPlugin { pname = "cmp-pandoc.nvim"; version = "2023-03-03"; src = fetchFromGitHub { @@ -1781,7 +1781,7 @@ final: prev: meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; }; - cmp-path = buildVimPluginFrom2Nix { + cmp-path = buildVimPlugin { pname = "cmp-path"; version = "2022-10-03"; src = fetchFromGitHub { @@ -1793,7 +1793,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; - cmp-rg = buildVimPluginFrom2Nix { + cmp-rg = buildVimPlugin { pname = "cmp-rg"; version = "2023-09-01"; src = fetchFromGitHub { @@ -1805,31 +1805,31 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; - cmp-snippy = buildVimPluginFrom2Nix { + cmp-snippy = buildVimPlugin { pname = "cmp-snippy"; - version = "2023-06-15"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "cmp-snippy"; - rev = "c4dc31232c510cd32d4708701e6f06746d46df90"; - sha256 = "1713shiq0cdm2igy3wf5ryjv4wfvbnvrg9xf17klw3hjhdknvyax"; + rev = "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3"; + sha256 = "1l4wrgkxwmw7vyjxl2y30f3xng7qaacvas4g0whqz2ybcl03rv5j"; }; meta.homepage = "https://github.com/dcampos/cmp-snippy/"; }; - cmp-spell = buildVimPluginFrom2Nix { + cmp-spell = buildVimPlugin { pname = "cmp-spell"; - version = "2022-10-10"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa"; - sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv"; + rev = "32a0867efa59b43edbb2db67b0871cfad90c9b66"; + sha256 = "1yr2cq1b6di4k93pjlshkkf4phhd3lzmkm0s679j35crzgwhxnbd"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; - cmp-tabnine = buildVimPluginFrom2Nix { + cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; version = "2023-05-09"; src = fetchFromGitHub { @@ -1841,7 +1841,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; - cmp-tmux = buildVimPluginFrom2Nix { + cmp-tmux = buildVimPlugin { pname = "cmp-tmux"; version = "2023-09-02"; src = fetchFromGitHub { @@ -1853,19 +1853,19 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; - cmp-treesitter = buildVimPluginFrom2Nix { + cmp-treesitter = buildVimPlugin { pname = "cmp-treesitter"; - version = "2023-04-06"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "389eadd48c27aa6dc0e6b992644704f026802a2e"; - sha256 = "0kbxjpw7j90pgvwmx3cb47jkk01wx5q6fqr660llinqc1vmj1rsq"; + rev = "b8bc760dfcc624edd5454f0982b63786a822eed9"; + sha256 = "01fz8hj7qadg2h8q0d3xv7x9q0qsykbbvv6bdnw71j74rid4xw7k"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; - cmp-under-comparator = buildVimPluginFrom2Nix { + cmp-under-comparator = buildVimPlugin { pname = "cmp-under-comparator"; version = "2021-11-11"; src = fetchFromGitHub { @@ -1877,7 +1877,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; - cmp-vim-lsp = buildVimPluginFrom2Nix { + cmp-vim-lsp = buildVimPlugin { pname = "cmp-vim-lsp"; version = "2021-10-26"; src = fetchFromGitHub { @@ -1889,7 +1889,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; }; - cmp-vimwiki-tags = buildVimPluginFrom2Nix { + cmp-vimwiki-tags = buildVimPlugin { pname = "cmp-vimwiki-tags"; version = "2022-04-25"; src = fetchFromGitHub { @@ -1901,7 +1901,7 @@ final: prev: meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/"; }; - cmp-vsnip = buildVimPluginFrom2Nix { + cmp-vsnip = buildVimPlugin { pname = "cmp-vsnip"; version = "2022-11-22"; src = fetchFromGitHub { @@ -1913,7 +1913,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; - cmp-zsh = buildVimPluginFrom2Nix { + cmp-zsh = buildVimPlugin { pname = "cmp-zsh"; version = "2022-10-03"; src = fetchFromGitHub { @@ -1925,19 +1925,19 @@ final: prev: meta.homepage = "https://github.com/tamago324/cmp-zsh/"; }; - cmp_luasnip = buildVimPluginFrom2Nix { + cmp_luasnip = buildVimPlugin { pname = "cmp_luasnip"; - version = "2022-10-28"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "18095520391186d634a0045dacaa346291096566"; - sha256 = "0b91ap1l3nph46r7b5hcn7413yj3zhrz1jmn4xqp387ng35qz537"; + rev = "05a9ab28b53f71d1aece421ef32fee2cb857a843"; + sha256 = "0gw3jz65dnxkc618j26zj37gs1yycf7wql9yqc9glazjdjbljhlx"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; - coc-clap = buildVimPluginFrom2Nix { + coc-clap = buildVimPlugin { pname = "coc-clap"; version = "2021-09-18"; src = fetchFromGitHub { @@ -1949,7 +1949,7 @@ final: prev: meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; - coc-denite = buildVimPluginFrom2Nix { + coc-denite = buildVimPlugin { pname = "coc-denite"; version = "2021-02-24"; src = fetchFromGitHub { @@ -1961,7 +1961,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-denite/"; }; - coc-fzf = buildVimPluginFrom2Nix { + coc-fzf = buildVimPlugin { pname = "coc-fzf"; version = "2023-01-30"; src = fetchFromGitHub { @@ -1973,7 +1973,7 @@ final: prev: meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-lua = buildVimPluginFrom2Nix { + coc-lua = buildVimPlugin { pname = "coc-lua"; version = "2023-02-22"; src = fetchFromGitHub { @@ -1985,7 +1985,7 @@ final: prev: meta.homepage = "https://github.com/josa42/coc-lua/"; }; - coc-neco = buildVimPluginFrom2Nix { + coc-neco = buildVimPlugin { pname = "coc-neco"; version = "2020-04-07"; src = fetchFromGitHub { @@ -1997,19 +1997,19 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-svelte = buildVimPluginFrom2Nix { + coc-svelte = buildVimPlugin { pname = "coc-svelte"; - version = "2022-03-14"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "coc-extensions"; repo = "coc-svelte"; - rev = "7dda98527c0831e287ae8cd1c85cfc958c949d4a"; - sha256 = "0ci35dph7zz53hiw65xp79g6i8h5yk1zlcbinljfcdn5635wsjbn"; + rev = "b7aa4f70b6e22364b927cad4beb516ebe04175f8"; + sha256 = "0izq1wmafh278jbc55936d5dvnhrm3n2xmgln9m8ggrmp6751fzh"; }; meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; }; - coc-tailwindcss = buildVimPluginFrom2Nix { + coc-tailwindcss = buildVimPlugin { pname = "coc-tailwindcss"; version = "2020-08-19"; src = fetchFromGitHub { @@ -2021,19 +2021,19 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; }; - coc-nvim = buildVimPluginFrom2Nix { + coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2023-09-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "b4735a634aa397491fd6adcebd7deff501592f62"; - sha256 = "1yvyrdv95xskklv6dmpq656bhy5hixfswzymfcxqqchhz7w7nc7q"; + rev = "7b9e1ef0a1399907c51d23b6080b94a5aba4a654"; + sha256 = "10gdqqz71gbna9wy3awbncbn7m0g6wfn1256bx7ga8b3bsl3nmch"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; - coconut-vim = buildVimPluginFrom2Nix { + coconut-vim = buildVimPlugin { pname = "coconut.vim"; version = "2017-10-10"; src = fetchFromGitHub { @@ -2045,31 +2045,31 @@ final: prev: meta.homepage = "https://github.com/manicmaniac/coconut.vim/"; }; - codeium-vim = buildVimPluginFrom2Nix { + codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-09-15"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "45dd945883c2ff87553d78710797ad7a2602b269"; - sha256 = "042ah6laxrjlghc9nd7b1116qghh750x6qh9gg9apbha4w5zcpxx"; + rev = "6b0f2bbbbd7669af50775ad27eff0077858aa9b8"; + sha256 = "0i4y0nl9ncmsz4sal33mnah99gp8v67adl5rpqrwzami4ms1ji4g"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; - codewindow-nvim = buildVimPluginFrom2Nix { + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; - version = "2023-07-23"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "gorbit99"; repo = "codewindow.nvim"; - rev = "11fb5520898d22a563fe6a124a61c0d2887f3d3f"; - sha256 = "1rnw5z3vwc183gvk3v3xciyzgqwfp0jsd5vckj5gpig1lg9l4yzf"; + rev = "8c8f5ff66e123491c946c04848d744fcdc7cac6c"; + sha256 = "18xlrphibm5f49l04wrjzaxb2xfdqmydrj2d4pi7z6vxny6rkvgy"; }; meta.homepage = "https://github.com/gorbit99/codewindow.nvim/"; }; - codi-vim = buildVimPluginFrom2Nix { + codi-vim = buildVimPlugin { pname = "codi.vim"; version = "2023-02-28"; src = fetchFromGitHub { @@ -2081,7 +2081,7 @@ final: prev: meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; - colorbuddy-nvim = buildVimPluginFrom2Nix { + colorbuddy-nvim = buildVimPlugin { pname = "colorbuddy.nvim"; version = "2022-02-28"; src = fetchFromGitHub { @@ -2093,7 +2093,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; - colorizer = buildVimPluginFrom2Nix { + colorizer = buildVimPlugin { pname = "colorizer"; version = "2022-01-03"; src = fetchFromGitHub { @@ -2105,31 +2105,31 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; - com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { + com-cloudedmountain-ide-neovim = buildVimPlugin { pname = "com.cloudedmountain.ide.neovim"; - version = "2023-01-07"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "Domeee"; repo = "com.cloudedmountain.ide.neovim"; - rev = "d479b806f06cd6714e321cf88e94aae858e8274e"; - sha256 = "0nwp8drcy1bxd493gmi3bz41yw0avpvbfwx9dq03x9kxsjc81rsz"; + rev = "ade9b58e458049949dbd308a4d0554c3f20f5e4d"; + sha256 = "00sf0d5yd1xmfgzr6vf988qm10cdx2arxvvm4r4gy9pcqqfwgm18"; }; meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; - command-t = buildVimPluginFrom2Nix { + command-t = buildVimPlugin { pname = "command-t"; - version = "2023-08-07"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "459e9c6e7d5bd8f559bbf8101869d0c9e800b154"; - sha256 = "1iq1g83za7prgwwakdsf5j8dzb4gb00r76nflj1i3h3yj0kn2vsi"; + rev = "8e5e827754b255452b21b8acf31afedb3e123e1c"; + sha256 = "1akp63i9ffrl8g2mjd7mf332aq47p6xck398gqr6920kk0vlkyk7"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; - comment-nvim = buildVimPluginFrom2Nix { + comment-nvim = buildVimPlugin { pname = "comment.nvim"; version = "2023-08-07"; src = fetchFromGitHub { @@ -2141,7 +2141,7 @@ final: prev: meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; - committia-vim = buildVimPluginFrom2Nix { + committia-vim = buildVimPlugin { pname = "committia.vim"; version = "2021-11-24"; src = fetchFromGitHub { @@ -2153,7 +2153,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/committia.vim/"; }; - compe-conjure = buildVimPluginFrom2Nix { + compe-conjure = buildVimPlugin { pname = "compe-conjure"; version = "2020-12-06"; src = fetchFromGitHub { @@ -2165,7 +2165,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/compe-conjure/"; }; - compe-latex-symbols = buildVimPluginFrom2Nix { + compe-latex-symbols = buildVimPlugin { pname = "compe-latex-symbols"; version = "2021-05-14"; src = fetchFromGitHub { @@ -2177,7 +2177,7 @@ final: prev: meta.homepage = "https://github.com/GoldsteinE/compe-latex-symbols/"; }; - compe-tabnine = buildVimPluginFrom2Nix { + compe-tabnine = buildVimPlugin { pname = "compe-tabnine"; version = "2021-09-14"; src = fetchFromGitHub { @@ -2189,7 +2189,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; - compe-zsh = buildVimPluginFrom2Nix { + compe-zsh = buildVimPlugin { pname = "compe-zsh"; version = "2021-04-03"; src = fetchFromGitHub { @@ -2201,7 +2201,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/compe-zsh/"; }; - compiler-explorer-nvim = buildVimPluginFrom2Nix { + compiler-explorer-nvim = buildVimPlugin { pname = "compiler-explorer.nvim"; version = "2023-05-29"; src = fetchFromGitHub { @@ -2213,7 +2213,7 @@ final: prev: meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; - completion-buffers = buildVimPluginFrom2Nix { + completion-buffers = buildVimPlugin { pname = "completion-buffers"; version = "2021-01-17"; src = fetchFromGitHub { @@ -2225,7 +2225,7 @@ final: prev: meta.homepage = "https://github.com/steelsojka/completion-buffers/"; }; - completion-nvim = buildVimPluginFrom2Nix { + completion-nvim = buildVimPlugin { pname = "completion-nvim"; version = "2021-10-12"; src = fetchFromGitHub { @@ -2237,7 +2237,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; - completion-tabnine = buildVimPluginFrom2Nix { + completion-tabnine = buildVimPlugin { pname = "completion-tabnine"; version = "2021-09-27"; src = fetchFromGitHub { @@ -2249,7 +2249,7 @@ final: prev: meta.homepage = "https://github.com/aca/completion-tabnine/"; }; - completion-treesitter = buildVimPluginFrom2Nix { + completion-treesitter = buildVimPlugin { pname = "completion-treesitter"; version = "2020-06-26"; src = fetchFromGitHub { @@ -2261,7 +2261,7 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/completion-treesitter/"; }; - concealedyank-vim = buildVimPluginFrom2Nix { + concealedyank-vim = buildVimPlugin { pname = "concealedyank.vim"; version = "2013-03-24"; src = fetchFromGitHub { @@ -2273,7 +2273,7 @@ final: prev: meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; - conflict-marker-vim = buildVimPluginFrom2Nix { + conflict-marker-vim = buildVimPlugin { pname = "conflict-marker.vim"; version = "2022-11-01"; src = fetchFromGitHub { @@ -2285,7 +2285,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; - conjure = buildVimPluginFrom2Nix { + conjure = buildVimPlugin { pname = "conjure"; version = "2023-08-27"; src = fetchFromGitHub { @@ -2297,7 +2297,7 @@ final: prev: meta.homepage = "https://github.com/Olical/conjure/"; }; - context-vim = buildVimPluginFrom2Nix { + context-vim = buildVimPlugin { pname = "context.vim"; version = "2023-06-13"; src = fetchFromGitHub { @@ -2309,7 +2309,7 @@ final: prev: meta.homepage = "https://github.com/wellle/context.vim/"; }; - context_filetype-vim = buildVimPluginFrom2Nix { + context_filetype-vim = buildVimPlugin { pname = "context_filetype.vim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -2321,7 +2321,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; - copilot-cmp = buildVimPluginFrom2Nix { + copilot-cmp = buildVimPlugin { pname = "copilot-cmp"; version = "2023-09-09"; src = fetchFromGitHub { @@ -2333,31 +2333,31 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; - copilot-lua = buildVimPluginFrom2Nix { + copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-09-04"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "2c942f33ba5c621c906e625e00a1bb504b65e2f0"; - sha256 = "0dwvqf2spg0vg8vi5w2a75dyyl5s9kz3mgn9xbyp8a6pqdnvqfk1"; + rev = "1a8032ae496916ccc7a7a52ee79194fbef29f462"; + sha256 = "0a3k8nb39j0n14ylg84x8c6n8g4m7llx78vad2vz247wnyw4z9sj"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; - copilot-vim = buildVimPluginFrom2Nix { + copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-09-02"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "719dd8d0beab993dbad47a9e86ecb0dbd4a99da5"; - sha256 = "07shpmy4296mvcqzjs7hhaw1vg81rjncg6r1q8p1jxc6w5gq7b2g"; + rev = "998cf5ab1b85e844c7e8edb864a997e590df7182"; + sha256 = "1sf566vwyj21h9vbs64j8458v4ncqpmfb5cr74pyl59qi33yq1zd"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; - coq-artifacts = buildVimPluginFrom2Nix { + coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; version = "2023-09-07"; src = fetchFromGitHub { @@ -2369,7 +2369,7 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; - coq-thirdparty = buildVimPluginFrom2Nix { + coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; version = "2023-08-27"; src = fetchFromGitHub { @@ -2381,7 +2381,7 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; - coq-vim = buildVimPluginFrom2Nix { + coq-vim = buildVimPlugin { pname = "coq.vim"; version = "2013-01-16"; src = fetchFromGitHub { @@ -2393,19 +2393,19 @@ final: prev: meta.homepage = "https://github.com/jvoorhis/coq.vim/"; }; - coq_nvim = buildVimPluginFrom2Nix { + coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2023-09-05"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "e7304683400a65e3f85e6973fcc2ad2a1bc811e6"; - sha256 = "05jb2jarrw6amrpxalgxngdans89s18009vx4mx3l9imagn1rx5v"; + rev = "d4a58fa7ab20c928f88e416b3fcf6ada965bf314"; + sha256 = "0jk3gz1rbq1zwzly66gcxhkxqn2im45lr5q5vjg2idpvbn6y8zpf"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; - cosco-vim = buildVimPluginFrom2Nix { + cosco-vim = buildVimPlugin { pname = "cosco.vim"; version = "2018-08-07"; src = fetchFromGitHub { @@ -2417,7 +2417,7 @@ final: prev: meta.homepage = "https://github.com/lfilho/cosco.vim/"; }; - cpsm = buildVimPluginFrom2Nix { + cpsm = buildVimPlugin { pname = "cpsm"; version = "2021-07-25"; src = fetchFromGitHub { @@ -2429,19 +2429,19 @@ final: prev: meta.homepage = "https://github.com/nixprime/cpsm/"; }; - crates-nvim = buildVimPluginFrom2Nix { + crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-09-11"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "db629b5cfb2aa8de9e44efb795657297ee95ca91"; - sha256 = "00ndgfa070044sqjg41lxv26vvjahfa6b1ysydyccln9wa27n6nc"; + rev = "58bf989736765cae41fa5d0971027efeca033301"; + sha256 = "06yxlwmas7cz856y1ppbih261mipwda5sjvqzcci37igg6wgbkcq"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; - csapprox = buildVimPluginFrom2Nix { + csapprox = buildVimPlugin { pname = "csapprox"; version = "2013-07-27"; src = fetchFromGitHub { @@ -2453,7 +2453,7 @@ final: prev: meta.homepage = "https://github.com/godlygeek/csapprox/"; }; - csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix { + csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; version = "2022-07-15"; src = fetchFromGitHub { @@ -2465,19 +2465,19 @@ final: prev: meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; - csv-vim = buildVimPluginFrom2Nix { + csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2023-05-04"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "15ff93edf5b26c466affbb356e0696b7d6a3b499"; - sha256 = "0mjvy0lbcd3j5dnfq2575m29pbs8w3asdwmknhnk6by6aih3mdsj"; + rev = "4fd88346aed02123aa5daa1a363868a576c6fdcf"; + sha256 = "10c2hgzhnv1zr461hvp4cnxpfs0aja43whjimdsb5sjd4xk5x7cc"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; - ctrlp-cmatcher = buildVimPluginFrom2Nix { + ctrlp-cmatcher = buildVimPlugin { pname = "ctrlp-cmatcher"; version = "2015-10-15"; src = fetchFromGitHub { @@ -2489,7 +2489,7 @@ final: prev: meta.homepage = "https://github.com/JazzCore/ctrlp-cmatcher/"; }; - ctrlp-py-matcher = buildVimPluginFrom2Nix { + ctrlp-py-matcher = buildVimPlugin { pname = "ctrlp-py-matcher"; version = "2021-09-20"; src = fetchFromGitHub { @@ -2501,7 +2501,7 @@ final: prev: meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; - ctrlp-z = buildVimPluginFrom2Nix { + ctrlp-z = buildVimPlugin { pname = "ctrlp-z"; version = "2015-10-17"; src = fetchFromGitHub { @@ -2513,7 +2513,7 @@ final: prev: meta.homepage = "https://github.com/amiorin/ctrlp-z/"; }; - ctrlp-vim = buildVimPluginFrom2Nix { + ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; version = "2023-07-16"; src = fetchFromGitHub { @@ -2525,7 +2525,7 @@ final: prev: meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; - dart-vim-plugin = buildVimPluginFrom2Nix { + dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; version = "2023-07-18"; src = fetchFromGitHub { @@ -2537,7 +2537,7 @@ final: prev: meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; - dash-vim = buildVimPluginFrom2Nix { + dash-vim = buildVimPlugin { pname = "dash.vim"; version = "2017-09-12"; src = fetchFromGitHub { @@ -2549,19 +2549,19 @@ final: prev: meta.homepage = "https://github.com/rizzatti/dash.vim/"; }; - dashboard-nvim = buildVimPluginFrom2Nix { + dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-09-09"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "bbe0234168501b8ba46f24b4fb3cb7c5b88c0784"; - sha256 = "1876r48hxfz0x1ylkwr3ljgmls861rcjxx5rs686bqmdrwffm9lj"; + rev = "fd68b9d05aedc57e5d97a6b66a4e3db877872f64"; + sha256 = "1rdljb9kpr45dpapjxx2msw3v721bai6icf0xj22dd128z05ivzg"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; - defx-git = buildVimPluginFrom2Nix { + defx-git = buildVimPlugin { pname = "defx-git"; version = "2021-01-01"; src = fetchFromGitHub { @@ -2573,7 +2573,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; - defx-icons = buildVimPluginFrom2Nix { + defx-icons = buildVimPlugin { pname = "defx-icons"; version = "2021-08-21"; src = fetchFromGitHub { @@ -2585,7 +2585,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; - defx-nvim = buildVimPluginFrom2Nix { + defx-nvim = buildVimPlugin { pname = "defx.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -2597,7 +2597,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; - delimitMate = buildVimPluginFrom2Nix { + delimitMate = buildVimPlugin { pname = "delimitMate"; version = "2020-12-14"; src = fetchFromGitHub { @@ -2609,7 +2609,7 @@ final: prev: meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; - denite-extra = buildVimPluginFrom2Nix { + denite-extra = buildVimPlugin { pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { @@ -2621,7 +2621,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/denite-extra/"; }; - denite-git = buildVimPluginFrom2Nix { + denite-git = buildVimPlugin { pname = "denite-git"; version = "2021-01-25"; src = fetchFromGitHub { @@ -2633,7 +2633,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/denite-git/"; }; - denite-nvim = buildVimPluginFrom2Nix { + denite-nvim = buildVimPlugin { pname = "denite.nvim"; version = "2023-04-22"; src = fetchFromGitHub { @@ -2645,7 +2645,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; - denops-vim = buildVimPluginFrom2Nix { + denops-vim = buildVimPlugin { pname = "denops.vim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -2657,7 +2657,7 @@ final: prev: meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; - deol-nvim = buildVimPluginFrom2Nix { + deol-nvim = buildVimPlugin { pname = "deol.nvim"; version = "2023-08-21"; src = fetchFromGitHub { @@ -2669,7 +2669,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; - deoplete-clang = buildVimPluginFrom2Nix { + deoplete-clang = buildVimPlugin { pname = "deoplete-clang"; version = "2019-11-10"; src = fetchFromGitHub { @@ -2682,7 +2682,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-clang/"; }; - deoplete-dictionary = buildVimPluginFrom2Nix { + deoplete-dictionary = buildVimPlugin { pname = "deoplete-dictionary"; version = "2019-04-16"; src = fetchFromGitHub { @@ -2694,7 +2694,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/"; }; - deoplete-fish = buildVimPluginFrom2Nix { + deoplete-fish = buildVimPlugin { pname = "deoplete-fish"; version = "2020-04-04"; src = fetchFromGitHub { @@ -2706,7 +2706,7 @@ final: prev: meta.homepage = "https://github.com/ponko2/deoplete-fish/"; }; - deoplete-github = buildVimPluginFrom2Nix { + deoplete-github = buildVimPlugin { pname = "deoplete-github"; version = "2018-03-04"; src = fetchFromGitHub { @@ -2718,7 +2718,7 @@ final: prev: meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/"; }; - deoplete-go = buildVimPluginFrom2Nix { + deoplete-go = buildVimPlugin { pname = "deoplete-go"; version = "2021-03-30"; src = fetchFromGitHub { @@ -2731,7 +2731,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; }; - deoplete-greek = buildVimPluginFrom2Nix { + deoplete-greek = buildVimPlugin { pname = "deoplete-greek"; version = "2019-12-23"; src = fetchFromGitHub { @@ -2743,7 +2743,7 @@ final: prev: meta.homepage = "https://github.com/Inazuma110/deoplete-greek/"; }; - deoplete-jedi = buildVimPluginFrom2Nix { + deoplete-jedi = buildVimPlugin { pname = "deoplete-jedi"; version = "2022-11-15"; src = fetchFromGitHub { @@ -2755,7 +2755,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; - deoplete-julia = buildVimPluginFrom2Nix { + deoplete-julia = buildVimPlugin { pname = "deoplete-julia"; version = "2018-06-11"; src = fetchFromGitHub { @@ -2767,7 +2767,7 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/deoplete-julia/"; }; - deoplete-khard = buildVimPluginFrom2Nix { + deoplete-khard = buildVimPlugin { pname = "deoplete-khard"; version = "2020-09-18"; src = fetchFromGitHub { @@ -2779,7 +2779,7 @@ final: prev: meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; - deoplete-lsp = buildVimPluginFrom2Nix { + deoplete-lsp = buildVimPlugin { pname = "deoplete-lsp"; version = "2022-12-13"; src = fetchFromGitHub { @@ -2791,7 +2791,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; - deoplete-notmuch = buildVimPluginFrom2Nix { + deoplete-notmuch = buildVimPlugin { pname = "deoplete-notmuch"; version = "2018-12-11"; src = fetchFromGitHub { @@ -2803,7 +2803,7 @@ final: prev: meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; }; - deoplete-phpactor = buildVimPluginFrom2Nix { + deoplete-phpactor = buildVimPlugin { pname = "deoplete-phpactor"; version = "2020-09-12"; src = fetchFromGitHub { @@ -2815,7 +2815,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; - deoplete-rust = buildVimPluginFrom2Nix { + deoplete-rust = buildVimPlugin { pname = "deoplete-rust"; version = "2017-07-18"; src = fetchFromGitHub { @@ -2827,7 +2827,7 @@ final: prev: meta.homepage = "https://github.com/sebastianmarkow/deoplete-rust/"; }; - deoplete-tabnine = buildVimPluginFrom2Nix { + deoplete-tabnine = buildVimPlugin { pname = "deoplete-tabnine"; version = "2023-08-06"; src = fetchFromGitHub { @@ -2839,7 +2839,7 @@ final: prev: meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; - deoplete-ternjs = buildVimPluginFrom2Nix { + deoplete-ternjs = buildVimPlugin { pname = "deoplete-ternjs"; version = "2019-12-19"; src = fetchFromGitHub { @@ -2851,7 +2851,7 @@ final: prev: meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; - deoplete-vim-lsp = buildVimPluginFrom2Nix { + deoplete-vim-lsp = buildVimPlugin { pname = "deoplete-vim-lsp"; version = "2021-02-22"; src = fetchFromGitHub { @@ -2863,7 +2863,7 @@ final: prev: meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; - deoplete-zsh = buildVimPluginFrom2Nix { + deoplete-zsh = buildVimPlugin { pname = "deoplete-zsh"; version = "2019-11-10"; src = fetchFromGitHub { @@ -2875,7 +2875,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; }; - deoplete-nvim = buildVimPluginFrom2Nix { + deoplete-nvim = buildVimPlugin { pname = "deoplete.nvim"; version = "2023-08-06"; src = fetchFromGitHub { @@ -2887,7 +2887,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; - devdocs-vim = buildVimPluginFrom2Nix { + devdocs-vim = buildVimPlugin { pname = "devdocs.vim"; version = "2018-08-27"; src = fetchFromGitHub { @@ -2899,7 +2899,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/devdocs.vim/"; }; - dhall-vim = buildVimPluginFrom2Nix { + dhall-vim = buildVimPlugin { pname = "dhall-vim"; version = "2021-06-05"; src = fetchFromGitHub { @@ -2911,7 +2911,7 @@ final: prev: meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; - diaglist-nvim = buildVimPluginFrom2Nix { + diaglist-nvim = buildVimPlugin { pname = "diaglist.nvim"; version = "2022-09-01"; src = fetchFromGitHub { @@ -2923,7 +2923,7 @@ final: prev: meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; - diagnostic-nvim = buildVimPluginFrom2Nix { + diagnostic-nvim = buildVimPlugin { pname = "diagnostic-nvim"; version = "2020-11-13"; src = fetchFromGitHub { @@ -2935,31 +2935,31 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; - dial-nvim = buildVimPluginFrom2Nix { + dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2023-09-09"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "611cf5e84f655c96318b803785f89e3146d8e48f"; - sha256 = "1gv1qjm1paxgrcchxbkfn7v9ygq7nhpf8wcc304fc2s4q5awvjn3"; + rev = "019bbe9daea397c93a99adc747f8f071379fee5c"; + sha256 = "1ihgmg2kws57wypiyzibdh50gccxk7gl1iah84fcbyzm0lfdvk5p"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; - diffview-nvim = buildVimPluginFrom2Nix { + diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-08-21"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "7e5a85c186027cab1e825d018f07c350177077fc"; - sha256 = "0jzlrk8dbijwzv5gc80s4bh3ji3bcxxdfffk5jbzlijjs76cpwl9"; + rev = "d38c1b5266850f77f75e006bcc26213684e1e141"; + sha256 = "1byqdh3x2yy1rj3gq0hyxpxwzlipvhv07ni9gz4644ssavjhalb6"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; - dirbuf-nvim = buildVimPluginFrom2Nix { + dirbuf-nvim = buildVimPlugin { pname = "dirbuf.nvim"; version = "2022-08-28"; src = fetchFromGitHub { @@ -2971,7 +2971,7 @@ final: prev: meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/"; }; - direnv-vim = buildVimPluginFrom2Nix { + direnv-vim = buildVimPlugin { pname = "direnv.vim"; version = "2023-06-26"; src = fetchFromGitHub { @@ -2983,7 +2983,7 @@ final: prev: meta.homepage = "https://github.com/direnv/direnv.vim/"; }; - distant-nvim = buildVimPluginFrom2Nix { + distant-nvim = buildVimPlugin { pname = "distant.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -2995,7 +2995,7 @@ final: prev: meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/"; }; - doki-theme-vim = buildVimPluginFrom2Nix { + doki-theme-vim = buildVimPlugin { pname = "doki-theme-vim"; version = "2023-01-07"; src = fetchFromGitHub { @@ -3007,7 +3007,7 @@ final: prev: meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; - dracula-nvim = buildVimPluginFrom2Nix { + dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; version = "2023-07-29"; src = fetchFromGitHub { @@ -3019,31 +3019,31 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; - dressing-nvim = buildVimPluginFrom2Nix { + dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2023-09-05"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504"; - sha256 = "0kxal34ll2xqgaa9sc1pyh7481q1kcfkqsn356brfwf277hflr7a"; + rev = "1f2d1206a03bd3add8aedf6251e4534611de577f"; + sha256 = "19s6d78y6axpq1iqsd8wqmrx8dlmxpnrjgdzpin5wyrwkx4zf9jf"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; - dropbar-nvim = buildVimPluginFrom2Nix { + dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-09-05"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "d9e2b240e9d4fe42fc74c9e40127f3217f00e14b"; - sha256 = "0bp845ll7pj7il0zkyqdvq735grfws6lw8hywqfwa15xxqys6xwf"; + rev = "79309dccd5e5b94f9ddf5ee8587691d2bfea2858"; + sha256 = "0wg1bq10z4ykwdniznzs6zv2v6888ykh3x3immxz30rix3j109m1"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; - echodoc-vim = buildVimPluginFrom2Nix { + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; src = fetchFromGitHub { @@ -3055,7 +3055,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; - edge = buildVimPluginFrom2Nix { + edge = buildVimPlugin { pname = "edge"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3067,7 +3067,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/edge/"; }; - edgedb-vim = buildVimPluginFrom2Nix { + edgedb-vim = buildVimPlugin { pname = "edgedb-vim"; version = "2023-05-26"; src = fetchFromGitHub { @@ -3079,32 +3079,32 @@ final: prev: meta.homepage = "https://github.com/edgedb/edgedb-vim/"; }; - edgy-nvim = buildVimPluginFrom2Nix { + edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2023-07-25"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4"; - sha256 = "0s0h8s2wwg2niacp401j7l3c0knl44awf32clq15h1hcabqvvkn3"; + rev = "8355be45610afdf79a0bab32b91ee297997455b4"; + sha256 = "0hjlxkyhi5aw6b157i9hr2cdcz63r0qag0l3hf2hcmjzvjjb51ls"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; - editorconfig-vim = buildVimPluginFrom2Nix { + editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2023-08-30"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "aefcf3d735122f349b172302d164d5eb61cd7e5f"; - sha256 = "1aj3bx2gf348mka27bw7k85kgm8j9gpiih5p79zrsry515vy0smx"; + rev = "0d54ea863089fb13be423b4aed6cca35f3a5d778"; + sha256 = "1d5r480njjgvn5w5ldhrj5gi38lqhnlyi1f7fvpjgl0lbyyqwp9s"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; - editorconfig-nvim = buildVimPluginFrom2Nix { + editorconfig-nvim = buildVimPlugin { pname = "editorconfig.nvim"; version = "2023-01-10"; src = fetchFromGitHub { @@ -3116,31 +3116,31 @@ final: prev: meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; - efmls-configs-nvim = buildVimPluginFrom2Nix { + efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-09-16"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "055323cf4fefe7032165867a8e9ffa7b638b5770"; - sha256 = "10ifgv4iaqi4pcfv1q7xqvizf0755vv342m226h524b17f2q1skx"; + rev = "3fade5690e31f80b70eb5fc5a7fa7a8da6644fe9"; + sha256 = "13vwc1nb4xzm99iv9pbnw3gq3bda4sbfx2jy3f2zv41gfxxzzc4x"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; - elixir-tools-nvim = buildVimPluginFrom2Nix { + elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-09-15"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "33eace2f6943d8240f8030e76569806f11090f5b"; - sha256 = "1mh235yss7j5z7qqidpf365s0bl22h9mvmfdb8s76gvgasf33rg3"; + rev = "4b3c1c23a83361559676981575083436cf9b7245"; + sha256 = "02aprmr3jchlr16l9r0c02cf1hrc7cmkvm00w0wa3saps5a59nsr"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; - elm-vim = buildVimPluginFrom2Nix { + elm-vim = buildVimPlugin { pname = "elm-vim"; version = "2020-09-23"; src = fetchFromGitHub { @@ -3152,7 +3152,7 @@ final: prev: meta.homepage = "https://github.com/elmcast/elm-vim/"; }; - elvish-vim = buildVimPluginFrom2Nix { + elvish-vim = buildVimPlugin { pname = "elvish.vim"; version = "2022-04-04"; src = fetchFromGitHub { @@ -3164,7 +3164,7 @@ final: prev: meta.homepage = "https://github.com/dmix/elvish.vim/"; }; - emmet-vim = buildVimPluginFrom2Nix { + emmet-vim = buildVimPlugin { pname = "emmet-vim"; version = "2021-12-04"; src = fetchFromGitHub { @@ -3177,7 +3177,7 @@ final: prev: meta.homepage = "https://github.com/mattn/emmet-vim/"; }; - emodeline = buildVimPluginFrom2Nix { + emodeline = buildVimPlugin { pname = "emodeline"; version = "2010-10-18"; src = fetchFromGitHub { @@ -3189,7 +3189,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; - errormarker-vim = buildVimPluginFrom2Nix { + errormarker-vim = buildVimPlugin { pname = "errormarker.vim"; version = "2015-01-26"; src = fetchFromGitHub { @@ -3201,7 +3201,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/errormarker.vim/"; }; - everforest = buildVimPluginFrom2Nix { + everforest = buildVimPlugin { pname = "everforest"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3213,7 +3213,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/everforest/"; }; - executor-nvim = buildVimPluginFrom2Nix { + executor-nvim = buildVimPlugin { pname = "executor.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -3225,7 +3225,7 @@ final: prev: meta.homepage = "https://github.com/google/executor.nvim/"; }; - eyeliner-nvim = buildVimPluginFrom2Nix { + eyeliner-nvim = buildVimPlugin { pname = "eyeliner.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -3237,7 +3237,7 @@ final: prev: meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; - falcon = buildVimPluginFrom2Nix { + falcon = buildVimPlugin { pname = "falcon"; version = "2023-03-12"; src = fetchFromGitHub { @@ -3249,7 +3249,7 @@ final: prev: meta.homepage = "https://github.com/fenetikm/falcon/"; }; - far-vim = buildVimPluginFrom2Nix { + far-vim = buildVimPlugin { pname = "far.vim"; version = "2022-08-25"; src = fetchFromGitHub { @@ -3261,7 +3261,7 @@ final: prev: meta.homepage = "https://github.com/brooth/far.vim/"; }; - fastfold = buildVimPluginFrom2Nix { + fastfold = buildVimPlugin { pname = "fastfold"; version = "2023-03-21"; src = fetchFromGitHub { @@ -3273,7 +3273,7 @@ final: prev: meta.homepage = "https://github.com/konfekt/fastfold/"; }; - fcitx-vim = buildVimPluginFrom2Nix { + fcitx-vim = buildVimPlugin { pname = "fcitx.vim"; version = "2023-08-03"; src = fetchFromGitHub { @@ -3285,19 +3285,19 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; - feline-nvim = buildVimPluginFrom2Nix { + feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-06-19"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "c32c2ffcee38f14e157582552fa9ee41c24452d2"; - sha256 = "1mlwjxyb0w3pdg9ny7q6wjdhq1l35a1g4ylp28vfpnrvhfbbxzvy"; + rev = "ee9f8afdbe8654001b200530903f1dcbcc3394e6"; + sha256 = "1x7c6shkx5gxqv7lcby40gkx5f7sr4rgv23pxbzk0l2xy6nsvvmd"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; - fennel-vim = buildVimPluginFrom2Nix { + fennel-vim = buildVimPlugin { pname = "fennel.vim"; version = "2020-11-15"; src = fetchFromGitHub { @@ -3309,7 +3309,7 @@ final: prev: meta.homepage = "https://github.com/bakpakin/fennel.vim/"; }; - fern-vim = buildVimPluginFrom2Nix { + fern-vim = buildVimPlugin { pname = "fern.vim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -3321,19 +3321,19 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; - ferret = buildVimPluginFrom2Nix { + ferret = buildVimPlugin { pname = "ferret"; - version = "2022-12-08"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "22cf052269b1143cd579b81c9390880ac712b67f"; - sha256 = "0pwwyf0fwwqaxa9sqm74aqy5r0wvyh24csg8mwp4cyhkdnk2w1rf"; + rev = "343b6934e9369d10d64c25642586dfdbab01bf45"; + sha256 = "0yam4066mkhndpmv1d1icql8fi7fzjv8p1gg7vnjnkzizcgprw8k"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; - fidget-nvim = buildVimPluginFrom2Nix { + fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; version = "2023-06-10"; src = fetchFromGitHub { @@ -3345,7 +3345,7 @@ final: prev: meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; - file-line = buildVimPluginFrom2Nix { + file-line = buildVimPlugin { pname = "file-line"; version = "2016-10-21"; src = fetchFromGitHub { @@ -3357,7 +3357,7 @@ final: prev: meta.homepage = "https://github.com/bogado/file-line/"; }; - firenvim = buildVimPluginFrom2Nix { + firenvim = buildVimPlugin { pname = "firenvim"; version = "2023-08-18"; src = fetchFromGitHub { @@ -3369,7 +3369,7 @@ final: prev: meta.homepage = "https://github.com/glacambre/firenvim/"; }; - flake8-vim = buildVimPluginFrom2Nix { + flake8-vim = buildVimPlugin { pname = "flake8-vim"; version = "2020-10-20"; src = fetchFromGitHub { @@ -3382,31 +3382,31 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; - flash-nvim = buildVimPluginFrom2Nix { + flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-08-29"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "8a8e74922a383c253b7f92e042b749150140c8d1"; - sha256 = "19a1i4lh4ij5x7pqrvs43yw24li1zajxrm6zrlbiffwppl7903dl"; + rev = "48817af25f51c0590653bbc290866e4890fe1cbe"; + sha256 = "0cf1ll91mhqw73p3y366fxylrq0y222jl2kb8sxf2s4gisxpppcg"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; - flatten-nvim = buildVimPluginFrom2Nix { + flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-09-15"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "9d0fa9964f88de09990e661d1014487f9ad028fd"; - sha256 = "1hsykmrvrmp2kfspqw5h8r72pn1ipjidn3675zfzanzp92ldxrb5"; + rev = "f75bd1eae9aa826dda5ddc3a8cf5a0efa6df046b"; + sha256 = "094cmx9k03lh0ak8wnfc70s2ca81r0qddgcraja8px04c2fm5ln1"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; - flit-nvim = buildVimPluginFrom2Nix { + flit-nvim = buildVimPlugin { pname = "flit.nvim"; version = "2023-07-13"; src = fetchFromGitHub { @@ -3418,7 +3418,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; - float-preview-nvim = buildVimPluginFrom2Nix { + float-preview-nvim = buildVimPlugin { pname = "float-preview.nvim"; version = "2023-07-04"; src = fetchFromGitHub { @@ -3430,7 +3430,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; - floating-input-nvim = buildVimPluginFrom2Nix { + floating-input-nvim = buildVimPlugin { pname = "floating-input.nvim"; version = "2023-05-26"; src = fetchFromGitHub { @@ -3442,7 +3442,7 @@ final: prev: meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/"; }; - floating-nvim = buildVimPluginFrom2Nix { + floating-nvim = buildVimPlugin { pname = "floating.nvim"; version = "2021-07-19"; src = fetchFromGitHub { @@ -3454,7 +3454,7 @@ final: prev: meta.homepage = "https://github.com/fhill2/floating.nvim/"; }; - floobits-neovim = buildVimPluginFrom2Nix { + floobits-neovim = buildVimPlugin { pname = "floobits-neovim"; version = "2021-10-18"; src = fetchFromGitHub { @@ -3466,19 +3466,19 @@ final: prev: meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; - flutter-tools-nvim = buildVimPluginFrom2Nix { + flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2023-09-13"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "974859e9fafbff48450a85c0c7f57cb576c53626"; - sha256 = "04zaghw9dbwxz48rrssihr7907rcg6g3dmrxihhyzqqw6q33i2b2"; + rev = "7350750d46fbeb4d2bb4878157b658d435935299"; + sha256 = "031l98vwm5099q9xizldk8djn3yrckpp3nlbbd16b2iw7v7rgwm7"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; - fold-preview-nvim = buildVimPluginFrom2Nix { + fold-preview-nvim = buildVimPlugin { pname = "fold-preview.nvim"; version = "2023-01-27"; src = fetchFromGitHub { @@ -3490,19 +3490,19 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/"; }; - formatter-nvim = buildVimPluginFrom2Nix { + formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-08-14"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "44c89f09dcc220dc2a9b056e93c3a87c86e79804"; - sha256 = "0x07bqrwqzw56rvwarxxf9ylx01fk5a7ds1zq1fvjxizyf1qya03"; + rev = "34dcdfa0c75df667743b2a50dd99c84a557376f0"; + sha256 = "09dks17yi1cbk4gviv7kw7r04rcn8ridq75slm3vxf3jkid095ns"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; - forms = buildVimPluginFrom2Nix { + forms = buildVimPlugin { pname = "forms"; version = "2012-11-28"; src = fetchFromGitHub { @@ -3514,19 +3514,19 @@ final: prev: meta.homepage = "https://github.com/megaannum/forms/"; }; - friendly-snippets = buildVimPluginFrom2Nix { + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2023-09-03"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ebf6d6e83494cdd88a54a429340256f4dbb6a052"; - sha256 = "01z4xqb46xlycbv0w7akrf7rajy9rnl0jml0vk9dngblgcf1x2sp"; + rev = "43727c2ff84240e55d4069ec3e6158d74cb534b6"; + sha256 = "1sjk17gn919aa84dkjfagwwjsas9zfkbrk840bjf580k8m83d9m8"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; - fruzzy = buildVimPluginFrom2Nix { + fruzzy = buildVimPlugin { pname = "fruzzy"; version = "2020-08-31"; src = fetchFromGitHub { @@ -3538,7 +3538,7 @@ final: prev: meta.homepage = "https://github.com/raghur/fruzzy/"; }; - fugitive-gitlab-vim = buildVimPluginFrom2Nix { + fugitive-gitlab-vim = buildVimPlugin { pname = "fugitive-gitlab.vim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -3550,7 +3550,7 @@ final: prev: meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; - futhark-vim = buildVimPluginFrom2Nix { + futhark-vim = buildVimPlugin { pname = "futhark-vim"; version = "2021-08-24"; src = fetchFromGitHub { @@ -3562,7 +3562,7 @@ final: prev: meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; }; - fuzzy-nvim = buildVimPluginFrom2Nix { + fuzzy-nvim = buildVimPlugin { pname = "fuzzy.nvim"; version = "2023-05-15"; src = fetchFromGitHub { @@ -3574,7 +3574,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/fuzzy.nvim/"; }; - fwatch-nvim = buildVimPluginFrom2Nix { + fwatch-nvim = buildVimPlugin { pname = "fwatch.nvim"; version = "2022-07-04"; src = fetchFromGitHub { @@ -3586,19 +3586,19 @@ final: prev: meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; }; - fzf-checkout-vim = buildVimPluginFrom2Nix { + fzf-checkout-vim = buildVimPlugin { pname = "fzf-checkout.vim"; - version = "2022-12-27"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; - rev = "00d953bbe2fba8d816f61bfe675070d4505f7a4f"; - sha256 = "0c5k4l2glvs23z6f9pynsxjdc8ascbgngvrqncbnsp0djs8wgasj"; + rev = "db0289a6c8e77b08a0150627733722fd07d5fa62"; + sha256 = "0ssk2kfn16qdcjamwql15s73p1hfl422fvf6fgl1p0ww9fznzkll"; }; meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; - fzf-hoogle-vim = buildVimPluginFrom2Nix { + fzf-hoogle-vim = buildVimPlugin { pname = "fzf-hoogle.vim"; version = "2022-05-01"; src = fetchFromGitHub { @@ -3610,7 +3610,7 @@ final: prev: meta.homepage = "https://github.com/monkoose/fzf-hoogle.vim/"; }; - fzf-lsp-nvim = buildVimPluginFrom2Nix { + fzf-lsp-nvim = buildVimPlugin { pname = "fzf-lsp.nvim"; version = "2023-02-02"; src = fetchFromGitHub { @@ -3622,31 +3622,31 @@ final: prev: meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; - fzf-lua = buildVimPluginFrom2Nix { + fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-09-16"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "30df82df8f5f0932bc07ff11f64b94bdf89b884d"; - sha256 = "01ar6p0iknlk131g7j1x1cfb9yngnql2q7yalr0dlq4g1kv30id9"; + rev = "aeab02f60cab6c6caf8060eb183796a0dc030576"; + sha256 = "1cqk1fmm84c80x2x637bdgzawm02r67ipbc0m5mrzpn9rbbg52hi"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; - fzf-vim = buildVimPluginFrom2Nix { + fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2023-09-16"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "fe362d413a0286b1474c1d235c6eb1d0cd6ae8a4"; - sha256 = "0ff2h9ry67zpjjmn4f384bbfcmkyq7kbbsl3s6c1ykhhj6943b7g"; + rev = "d1016dbd7cec2d2a3bb5863776c84b4034e4b85e"; + sha256 = "1l4m20s2iqz6dcphqpp5xnvrbh0dl0mkchs2fmr4vjz9nw7sl1mi"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; - galaxyline-nvim = buildVimPluginFrom2Nix { + galaxyline-nvim = buildVimPlugin { pname = "galaxyline.nvim"; version = "2022-01-21"; src = fetchFromGitHub { @@ -3658,7 +3658,7 @@ final: prev: meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; - gen_tags-vim = buildVimPluginFrom2Nix { + gen_tags-vim = buildVimPlugin { pname = "gen_tags.vim"; version = "2023-03-06"; src = fetchFromGitHub { @@ -3670,7 +3670,7 @@ final: prev: meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; - gentoo-syntax = buildVimPluginFrom2Nix { + gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; version = "2023-06-14"; src = fetchFromGitHub { @@ -3682,19 +3682,19 @@ final: prev: meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; - ghcid = buildVimPluginFrom2Nix { + ghcid = buildVimPlugin { pname = "ghcid"; - version = "2023-07-02"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "19b0e912da74341993a005aa53a0c57fd2afc800"; - sha256 = "0vczhvbm62cac3vz9zbxhgimcgyqd5g33mc2sa46f45migcmvikz"; + rev = "b7dc5c4ee640b6c8137ecfd0a2b50df278015221"; + sha256 = "0cp6m8w9pmx3pzw1qyh0gm4c2z8akg1mwh27k9m0jgw1w00yqd87"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; - ghcmod-vim = buildVimPluginFrom2Nix { + ghcmod-vim = buildVimPlugin { pname = "ghcmod-vim"; version = "2016-06-19"; src = fetchFromGitHub { @@ -3706,7 +3706,7 @@ final: prev: meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; - gina-vim = buildVimPluginFrom2Nix { + gina-vim = buildVimPlugin { pname = "gina.vim"; version = "2022-03-30"; src = fetchFromGitHub { @@ -3718,31 +3718,31 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; - git-blame-nvim = buildVimPluginFrom2Nix { + git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-09-14"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "02fadac1702c014ce49a9499137d798934bdb465"; - sha256 = "1i5d388blpsrpms4ljqgy6sm1yhh172bf4ydjdbhvw16m6gpdkpm"; + rev = "e4dafc79cc7dcf4eec0547dbc6f3f3821b2f2b14"; + sha256 = "004l5kd4q4cfpinp9i5p7c7mv3jm5bcaybq7kiwmpw2d6adp5hg8"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; - git-conflict-nvim = buildVimPluginFrom2Nix { + git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2023-09-13"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "a0f1bffdb7ccb81bb16f4bbfd9740775835b71b3"; - sha256 = "13hx5ipfakilx0zfgq9jdv0i7yykqvvjly128diw4yxpzwvi7rnb"; + rev = "896261933afe2fddf6fb043d9cd4d88301b151a9"; + sha256 = "1pkvhl1bf76nvc9rdyn60dq619pkwr2a03gn2zkqlap28lhw2xn8"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; - git-messenger-vim = buildVimPluginFrom2Nix { + git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; version = "2022-08-30"; src = fetchFromGitHub { @@ -3754,7 +3754,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; - git-worktree-nvim = buildVimPluginFrom2Nix { + git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; version = "2021-12-24"; src = fetchFromGitHub { @@ -3766,7 +3766,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; - gitignore-vim = buildVimPluginFrom2Nix { + gitignore-vim = buildVimPlugin { pname = "gitignore.vim"; version = "2014-03-16"; src = fetchFromGitHub { @@ -3778,7 +3778,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; - gitlinker-nvim = buildVimPluginFrom2Nix { + gitlinker-nvim = buildVimPlugin { pname = "gitlinker.nvim"; version = "2023-02-03"; src = fetchFromGitHub { @@ -3792,17 +3792,17 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-09-12"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "907ae8636016aab2f283576fc60d46ca3427e579"; - sha256 = "0v2ikhhqqxrfzp6wnqcszazq3zbmlf1g3n1jgln459bsyj7qq00v"; + rev = "ff01d34daaed72f271a8ffa088a7e839a60c640f"; + sha256 = "0clyngmmz0qilnjykqc8n7c5kidspywazwy3axsikgh4x8wzdn17"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; - gitv = buildVimPluginFrom2Nix { + gitv = buildVimPlugin { pname = "gitv"; version = "2019-08-22"; src = fetchFromGitHub { @@ -3814,7 +3814,7 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; - glance-nvim = buildVimPluginFrom2Nix { + glance-nvim = buildVimPlugin { pname = "glance.nvim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -3826,7 +3826,7 @@ final: prev: meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; - gleam-vim = buildVimPluginFrom2Nix { + gleam-vim = buildVimPlugin { pname = "gleam.vim"; version = "2020-06-24"; src = fetchFromGitHub { @@ -3838,7 +3838,7 @@ final: prev: meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; - glow-nvim = buildVimPluginFrom2Nix { + glow-nvim = buildVimPlugin { pname = "glow.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -3850,19 +3850,19 @@ final: prev: meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; - go-nvim = buildVimPluginFrom2Nix { + go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-09-07"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "5e9e083f4927402eab6ab233e970b397daa2e826"; - sha256 = "0mqfmmaazx18ji75rwvvcw1slyrhllpgdlzfwg61q5bnkr8a2p92"; + rev = "d73ea5bc00f0d7b726b0ddfc29cea17a544459ba"; + sha256 = "1qaav736d4k70bixwc5qrf4pi9983b3i92bwnnvairg69b3fwa59"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; - godbolt-nvim = buildVimPluginFrom2Nix { + godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -3874,7 +3874,7 @@ final: prev: meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; - golden-ratio = buildVimPluginFrom2Nix { + golden-ratio = buildVimPlugin { pname = "golden-ratio"; version = "2022-06-28"; src = fetchFromGitHub { @@ -3886,7 +3886,7 @@ final: prev: meta.homepage = "https://github.com/roman/golden-ratio/"; }; - gotests-vim = buildVimPluginFrom2Nix { + gotests-vim = buildVimPlugin { pname = "gotests-vim"; version = "2022-07-12"; src = fetchFromGitHub { @@ -3898,19 +3898,19 @@ final: prev: meta.homepage = "https://github.com/buoto/gotests-vim/"; }; - goto-preview = buildVimPluginFrom2Nix { + goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2023-07-19"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "84532db88f8ee272bcd1c07cda55884e23fd9087"; - sha256 = "0insrplfq6rwm9bgfj5adjk8c4mbvqhpzbd32lqq6bg4960m09vl"; + rev = "b428db4d2a5b7c06e149a020e31b2121fbf57a67"; + sha256 = "13lc0yjmwzwkdj92rlcwqpyic30z5vq3ss73bkzwl4vkqg413zla"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; - goyo-vim = buildVimPluginFrom2Nix { + goyo-vim = buildVimPlugin { pname = "goyo.vim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -3922,7 +3922,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; - grammar-guard-nvim = buildVimPluginFrom2Nix { + grammar-guard-nvim = buildVimPlugin { pname = "grammar-guard.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -3934,7 +3934,7 @@ final: prev: meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/"; }; - graphviz-vim = buildVimPluginFrom2Nix { + graphviz-vim = buildVimPlugin { pname = "graphviz.vim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -3946,7 +3946,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; - gruvbox = buildVimPluginFrom2Nix { + gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; src = fetchFromGitHub { @@ -3958,7 +3958,7 @@ final: prev: meta.homepage = "https://github.com/morhetz/gruvbox/"; }; - gruvbox-flat-nvim = buildVimPluginFrom2Nix { + gruvbox-flat-nvim = buildVimPlugin { pname = "gruvbox-flat.nvim"; version = "2023-05-27"; src = fetchFromGitHub { @@ -3970,31 +3970,31 @@ final: prev: meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; - gruvbox-material = buildVimPluginFrom2Nix { + gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2023-08-07"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "b5f8c6a6c1cda630c53b061b765068a0898d47a3"; - sha256 = "1vb36n4kd08bfprmfjds2kg11wmwhrd1hqpg67lmhkpccgl0xdsn"; + rev = "c75bf1e96fdc33b8b3b613e5172a0acdba198fca"; + sha256 = "0sl7q943vxpfhkw8znzjs1i1iaz3mvbj0b8blidkl2b4377di2i6"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; - gruvbox-nvim = buildVimPluginFrom2Nix { + gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-08-29"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "7fb36e0f67aa6f3d7f3e54f37ca7032ea1af0b59"; - sha256 = "0i9aivg66fg9rp9m9z8vzg3g15yfki5c9hrwhd5j577k5m8bybj6"; + rev = "477c62493c82684ed510c4f70eaf83802e398898"; + sha256 = "0250c24c6n6yri48l288irdawhqs16qna3y74rdkgjd2jvh66vdm"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; - guess-indent-nvim = buildVimPluginFrom2Nix { + guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; version = "2023-04-03"; src = fetchFromGitHub { @@ -4006,7 +4006,7 @@ final: prev: meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; }; - gundo-vim = buildVimPluginFrom2Nix { + gundo-vim = buildVimPlugin { pname = "gundo.vim"; version = "2021-02-21"; src = fetchFromGitHub { @@ -4018,7 +4018,7 @@ final: prev: meta.homepage = "https://github.com/sjl/gundo.vim/"; }; - gv-vim = buildVimPluginFrom2Nix { + gv-vim = buildVimPlugin { pname = "gv.vim"; version = "2022-10-25"; src = fetchFromGitHub { @@ -4030,19 +4030,19 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; - hardtime-nvim = buildVimPluginFrom2Nix { + hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-09-11"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "370dea43c353c57bd2c9c985f43812b0634adb7b"; - sha256 = "070caab311blcl0j2ygmvv0rdqqb6kad6bvwwgravrwb3d4yy1a0"; + rev = "4accbaa408ea6ddb8adf8fd735208570ed78d6f8"; + sha256 = "17za9cgcx72gnh3sp2ppd824c5iac70ahj7cpc74caxglzyqpczs"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; - hare-vim = buildVimPluginFrom2Nix { + hare-vim = buildVimPlugin { pname = "hare.vim"; version = "2023-09-09"; src = fetchgit { @@ -4053,31 +4053,31 @@ final: prev: meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; - harpoon = buildVimPluginFrom2Nix { + harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-05-28"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc"; - sha256 = "03i86ss4n3fayqwsv8d9dxgrs5lq5sc5fgbc2fg1b963r3y6rk68"; + rev = "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a"; + sha256 = "0wqxg31z7gi7ap8r0057lpadywx3d245ghlljr6mkmp0jz3waad5"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-09-14"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "c41aad691fc16fc2ff334e7a2b4df79886323dad"; - sha256 = "088a55l4z6qmqi7dhsimarnhi7dpkcs44m4wwy4rsxwbc88g42fk"; + rev = "f8c13fd41c09df18a25b20c44db85fcdfa8e04d9"; + sha256 = "0nb75d1hrgx555sh5pq9f4znk8kqkb51g4l6wfv2fqy5masn1zkr"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; - haskell-vim = buildVimPluginFrom2Nix { + haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; src = fetchFromGitHub { @@ -4089,7 +4089,7 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; - haskell-with-unicode-vim = buildVimPluginFrom2Nix { + haskell-with-unicode-vim = buildVimPlugin { pname = "haskell-with-unicode.vim"; version = "2022-09-11"; src = fetchFromGitHub { @@ -4101,7 +4101,7 @@ final: prev: meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/"; }; - hasksyn = buildVimPluginFrom2Nix { + hasksyn = buildVimPlugin { pname = "hasksyn"; version = "2014-09-04"; src = fetchFromGitHub { @@ -4113,7 +4113,7 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; - headlines-nvim = buildVimPluginFrom2Nix { + headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; version = "2023-07-27"; src = fetchFromGitHub { @@ -4125,7 +4125,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; - heirline-nvim = buildVimPluginFrom2Nix { + heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; version = "2023-09-03"; src = fetchFromGitHub { @@ -4137,7 +4137,7 @@ final: prev: meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; - hex-nvim = buildVimPluginFrom2Nix { + hex-nvim = buildVimPlugin { pname = "hex.nvim"; version = "2023-09-09"; src = fetchFromGitHub { @@ -4149,7 +4149,7 @@ final: prev: meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; - hiPairs = buildVimPluginFrom2Nix { + hiPairs = buildVimPlugin { pname = "hiPairs"; version = "2020-12-10"; src = fetchFromGitHub { @@ -4161,19 +4161,19 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/hiPairs/"; }; - highlight-undo-nvim = buildVimPluginFrom2Nix { + highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2023-08-17"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "d9e674a2eb4d95ee16cd477d47eab7ddc586e336"; - sha256 = "02ic1ag8k28na6ia48bwkmg0ca961dliizjzsvhp28hkvvx6py9r"; + rev = "50a6884a8476be04ecce8f1c4ed692c5000ef0a1"; + sha256 = "09fmds9ibl6n4fgxmmypifnxpyc0slpinc2h5cvx0959i9ak0l13"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/"; }; - himalaya-vim = buildVimPluginFrom2Nix { + himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; version = "2023-09-14"; src = fetchgit { @@ -4184,7 +4184,7 @@ final: prev: meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; - hlint-refactor-vim = buildVimPluginFrom2Nix { + hlint-refactor-vim = buildVimPlugin { pname = "hlint-refactor-vim"; version = "2015-12-05"; src = fetchFromGitHub { @@ -4196,7 +4196,7 @@ final: prev: meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; - hmts-nvim = buildVimPluginFrom2Nix { + hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -4208,7 +4208,7 @@ final: prev: meta.homepage = "https://github.com/calops/hmts.nvim/"; }; - hologram-nvim = buildVimPluginFrom2Nix { + hologram-nvim = buildVimPlugin { pname = "hologram.nvim"; version = "2022-10-09"; src = fetchFromGitHub { @@ -4220,7 +4220,7 @@ final: prev: meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; - hoon-vim = buildVimPluginFrom2Nix { + hoon-vim = buildVimPlugin { pname = "hoon.vim"; version = "2023-05-04"; src = fetchFromGitHub { @@ -4232,19 +4232,19 @@ final: prev: meta.homepage = "https://github.com/urbit/hoon.vim/"; }; - hop-nvim = buildVimPluginFrom2Nix { + hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2023-09-09"; + version = "2023-10-02"; src = fetchFromGitHub { - owner = "phaazon"; + owner = "smoka7"; repo = "hop.nvim"; - rev = "1a1eceafe54b5081eae4cb91c723abd1d450f34b"; - sha256 = "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"; + rev = "1cbaa79457e6b5e9b04e6d5d8d19bd6b65ffa2be"; + sha256 = "11c0bk9djs0v1szas7bcw4myw204gc0s7byiw4mqsfjqcz1qzl3p"; }; - meta.homepage = "https://github.com/phaazon/hop.nvim/"; + meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; - hotpot-nvim = buildVimPluginFrom2Nix { + hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -4256,19 +4256,19 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; - hover-nvim = buildVimPluginFrom2Nix { + hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-09-10"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "f74d2924564ba5fd8faa2d7e7cf6065de26f9820"; - sha256 = "15p8yv72zigy0rwb52mjj9fwa5l37xdq19czy96zbfxhvs93zvpf"; + rev = "a173256a9dba938e876ceb4bb5d2742f8866e349"; + sha256 = "1srpdzw0jbw2nf4h4hj8rvjrhkcs66najp6wny4cj4dr80cwx77i"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; - html5-vim = buildVimPluginFrom2Nix { + html5-vim = buildVimPlugin { pname = "html5.vim"; version = "2020-08-22"; src = fetchFromGitHub { @@ -4280,7 +4280,7 @@ final: prev: meta.homepage = "https://github.com/othree/html5.vim/"; }; - hydra-nvim = buildVimPluginFrom2Nix { + hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; version = "2023-02-06"; src = fetchFromGitHub { @@ -4292,7 +4292,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; - i3config-vim = buildVimPluginFrom2Nix { + i3config-vim = buildVimPlugin { pname = "i3config.vim"; version = "2021-06-23"; src = fetchFromGitHub { @@ -4304,7 +4304,7 @@ final: prev: meta.homepage = "https://github.com/mboughaba/i3config.vim/"; }; - iceberg-vim = buildVimPluginFrom2Nix { + iceberg-vim = buildVimPlugin { pname = "iceberg.vim"; version = "2022-11-23"; src = fetchFromGitHub { @@ -4316,7 +4316,7 @@ final: prev: meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; - idris-vim = buildVimPluginFrom2Nix { + idris-vim = buildVimPlugin { pname = "idris-vim"; version = "2017-12-04"; src = fetchFromGitHub { @@ -4328,7 +4328,7 @@ final: prev: meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; - idris2-vim = buildVimPluginFrom2Nix { + idris2-vim = buildVimPlugin { pname = "idris2-vim"; version = "2020-11-26"; src = fetchFromGitHub { @@ -4340,19 +4340,19 @@ final: prev: meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; - image-nvim = buildVimPluginFrom2Nix { + image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-09-02"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "84e8324b603b50d753203113babbef6800982cf4"; - sha256 = "01g6zci4qlfwavlhja8h80z65z71ig9sgrblwys7r44rbdm748iz"; + rev = "4033806015457cc4fe4a6706a21949d9c0fb4c14"; + sha256 = "0hawknjgqsjjnzyixlj1946rpvav4xf6bfisria6vnf1pgqga40r"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; - impatient-nvim = buildVimPluginFrom2Nix { + impatient-nvim = buildVimPlugin { pname = "impatient.nvim"; version = "2023-05-05"; src = fetchFromGitHub { @@ -4364,7 +4364,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; - inc-rename-nvim = buildVimPluginFrom2Nix { + inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -4376,7 +4376,7 @@ final: prev: meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; - increment-activator = buildVimPluginFrom2Nix { + increment-activator = buildVimPlugin { pname = "increment-activator"; version = "2021-09-16"; src = fetchFromGitHub { @@ -4388,7 +4388,7 @@ final: prev: meta.homepage = "https://github.com/nishigori/increment-activator/"; }; - incsearch-easymotion-vim = buildVimPluginFrom2Nix { + incsearch-easymotion-vim = buildVimPlugin { pname = "incsearch-easymotion.vim"; version = "2016-01-18"; src = fetchFromGitHub { @@ -4400,7 +4400,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch-easymotion.vim/"; }; - incsearch-vim = buildVimPluginFrom2Nix { + incsearch-vim = buildVimPlugin { pname = "incsearch.vim"; version = "2022-05-13"; src = fetchFromGitHub { @@ -4412,19 +4412,19 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; - indent-blankline-nvim = buildVimPluginFrom2Nix { + indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-08-22"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9637670896b68805430e2f72cf5d16be5b97a22a"; - sha256 = "01h49q9j3hh5mi3hxsaipfsc03ypgg14r79fbm6sy63rh8a66jnl"; + rev = "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff"; + sha256 = "1m27krw7zdlbnnip046acnndkniif2a6kg7aj61mf6l1ikbzy9x2"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; - indent-o-matic = buildVimPluginFrom2Nix { + indent-o-matic = buildVimPlugin { pname = "indent-o-matic"; version = "2023-06-03"; src = fetchFromGitHub { @@ -4436,7 +4436,7 @@ final: prev: meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; }; - indentLine = buildVimPluginFrom2Nix { + indentLine = buildVimPlugin { pname = "indentLine"; version = "2023-07-14"; src = fetchFromGitHub { @@ -4448,7 +4448,7 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; - inkpot = buildVimPluginFrom2Nix { + inkpot = buildVimPlugin { pname = "inkpot"; version = "2013-02-10"; src = fetchFromGitHub { @@ -4460,7 +4460,7 @@ final: prev: meta.homepage = "https://github.com/ciaranm/inkpot/"; }; - instant-nvim = buildVimPluginFrom2Nix { + instant-nvim = buildVimPlugin { pname = "instant.nvim"; version = "2022-06-25"; src = fetchFromGitHub { @@ -4472,7 +4472,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/instant.nvim/"; }; - intellitab-nvim = buildVimPluginFrom2Nix { + intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; version = "2021-11-13"; src = fetchFromGitHub { @@ -4484,7 +4484,7 @@ final: prev: meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; }; - intero-neovim = buildVimPluginFrom2Nix { + intero-neovim = buildVimPlugin { pname = "intero-neovim"; version = "2019-11-15"; src = fetchFromGitHub { @@ -4496,7 +4496,7 @@ final: prev: meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; - investigate-vim = buildVimPluginFrom2Nix { + investigate-vim = buildVimPlugin { pname = "investigate.vim"; version = "2020-02-29"; src = fetchFromGitHub { @@ -4508,7 +4508,7 @@ final: prev: meta.homepage = "https://github.com/keith/investigate.vim/"; }; - iosvkem = buildVimPluginFrom2Nix { + iosvkem = buildVimPlugin { pname = "iosvkem"; version = "2021-03-26"; src = fetchFromGitHub { @@ -4520,7 +4520,7 @@ final: prev: meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; - ir_black = buildVimPluginFrom2Nix { + ir_black = buildVimPlugin { pname = "ir_black"; version = "2012-03-05"; src = fetchFromGitHub { @@ -4532,7 +4532,7 @@ final: prev: meta.homepage = "https://github.com/twerth/ir_black/"; }; - iron-nvim = buildVimPluginFrom2Nix { + iron-nvim = buildVimPlugin { pname = "iron.nvim"; version = "2023-07-13"; src = fetchFromGitHub { @@ -4544,7 +4544,7 @@ final: prev: meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; - is-vim = buildVimPluginFrom2Nix { + is-vim = buildVimPlugin { pname = "is.vim"; version = "2020-10-27"; src = fetchFromGitHub { @@ -4556,7 +4556,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/is.vim/"; }; - jdaddy-vim = buildVimPluginFrom2Nix { + jdaddy-vim = buildVimPlugin { pname = "jdaddy.vim"; version = "2014-02-22"; src = fetchFromGitHub { @@ -4568,20 +4568,20 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; }; - jedi-vim = buildVimPluginFrom2Nix { + jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "2023-07-31"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "338af171ea32bb9d4705429d3aef20735d567c87"; - sha256 = "0mwnzvv3pr9ny7bfd98q78mjyw9zhgvnz38drh3y3l0h5f6i9z08"; + rev = "b82da7d2b5efa28449f1a46e906dee439f68240c"; + sha256 = "136v3484p88xd5z7j8alxp0i7kdywkd3nkz8830xvrhxsqz3vr0f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; }; - jellybeans-nvim = buildVimPluginFrom2Nix { + jellybeans-nvim = buildVimPlugin { pname = "jellybeans-nvim"; version = "2022-03-21"; src = fetchFromGitHub { @@ -4593,7 +4593,7 @@ final: prev: meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/"; }; - jellybeans-vim = buildVimPluginFrom2Nix { + jellybeans-vim = buildVimPlugin { pname = "jellybeans.vim"; version = "2019-06-22"; src = fetchFromGitHub { @@ -4605,7 +4605,7 @@ final: prev: meta.homepage = "https://github.com/nanotech/jellybeans.vim/"; }; - jinja-vim = buildVimPluginFrom2Nix { + jinja-vim = buildVimPlugin { pname = "jinja.vim"; version = "2020-06-18"; src = fetchFromGitHub { @@ -4617,19 +4617,19 @@ final: prev: meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; - jq-vim = buildVimPluginFrom2Nix { + jq-vim = buildVimPlugin { pname = "jq.vim"; - version = "2022-11-26"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "6ff60efab7a15c60ff073c5bb7aec2858a0bafba"; + rev = "6f10c6977d46cbb3b3d0f2170e726f36af588bc2"; sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; }; - jsonc-vim = buildVimPluginFrom2Nix { + jsonc-vim = buildVimPlugin { pname = "jsonc.vim"; version = "2022-10-31"; src = fetchFromGitHub { @@ -4641,7 +4641,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/jsonc.vim/"; }; - julia-vim = buildVimPluginFrom2Nix { + julia-vim = buildVimPlugin { pname = "julia-vim"; version = "2023-07-05"; src = fetchFromGitHub { @@ -4653,19 +4653,19 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; - kanagawa-nvim = buildVimPluginFrom2Nix { + kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2023-09-13"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "a4e99f089110c6d00bc33f5497709200e914e763"; - sha256 = "0c8fqpxxgp7k5yvqf28fwxjfwqnyvl55hapw0vlmaak93qnfndxq"; + rev = "c19b9023842697ec92caf72cd3599f7dd7be4456"; + sha256 = "07wwz1z3am862igx6hkkyymvj2807a1a0y51324jvk27csidrcm5"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; - keymap-layer-nvim = buildVimPluginFrom2Nix { + keymap-layer-nvim = buildVimPlugin { pname = "keymap-layer.nvim"; version = "2022-07-16"; src = fetchFromGitHub { @@ -4677,7 +4677,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/keymap-layer.nvim/"; }; - kmonad-vim = buildVimPluginFrom2Nix { + kmonad-vim = buildVimPlugin { pname = "kmonad-vim"; version = "2022-03-20"; src = fetchFromGitHub { @@ -4689,7 +4689,7 @@ final: prev: meta.homepage = "https://github.com/kmonad/kmonad-vim/"; }; - knap = buildVimPluginFrom2Nix { + knap = buildVimPlugin { pname = "knap"; version = "2023-07-25"; src = fetchFromGitHub { @@ -4701,7 +4701,7 @@ final: prev: meta.homepage = "https://github.com/frabjous/knap/"; }; - kommentary = buildVimPluginFrom2Nix { + kommentary = buildVimPlugin { pname = "kommentary"; version = "2023-01-06"; src = fetchFromGitHub { @@ -4713,7 +4713,7 @@ final: prev: meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; - kotlin-vim = buildVimPluginFrom2Nix { + kotlin-vim = buildVimPlugin { pname = "kotlin-vim"; version = "2022-12-30"; src = fetchFromGitHub { @@ -4725,7 +4725,7 @@ final: prev: meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; - lalrpop-vim = buildVimPluginFrom2Nix { + lalrpop-vim = buildVimPlugin { pname = "lalrpop.vim"; version = "2017-11-22"; src = fetchFromGitHub { @@ -4737,7 +4737,7 @@ final: prev: meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; - last256 = buildVimPluginFrom2Nix { + last256 = buildVimPlugin { pname = "last256"; version = "2020-12-09"; src = fetchFromGitHub { @@ -4749,7 +4749,7 @@ final: prev: meta.homepage = "https://github.com/sk1418/last256/"; }; - latex-box = buildVimPluginFrom2Nix { + latex-box = buildVimPlugin { pname = "latex-box"; version = "2015-06-01"; src = fetchFromGitHub { @@ -4761,7 +4761,7 @@ final: prev: meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; - lazy-lsp-nvim = buildVimPluginFrom2Nix { + lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -4773,43 +4773,43 @@ final: prev: meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; - lazy-nvim = buildVimPluginFrom2Nix { + lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-08-26"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01"; - sha256 = "01c09qqzjlmsksac39g2bqygx0xh5ibzb3s4v35b9mlhfyylaxyk"; + rev = "7613ab2abb1bd99e039ae02030bc2c48b7626925"; + sha256 = "0n2xzi8n8ywn7w3zkmp7sx9di46m1k2ym6072awbi2wlknlxxxxs"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; - lazygit-nvim = buildVimPluginFrom2Nix { + lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2023-09-05"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "75c920883f44243f2bbb172be423e484a58f7c45"; - sha256 = "101vnzc67yxadziyyjc07kca7jd9ms3gfqjkaq7lg3gh5q1gh5my"; + rev = "de35012036d43bca03628d40d083f7c02a4cda3f"; + sha256 = "1wgcl487gijm0ydp8n79jc8pmh947vphhh67vk6p79fxaihc56bl"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; - lean-nvim = buildVimPluginFrom2Nix { + lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-09-14"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "ad8305e07dd6226724e87607c9c5a8331bb3f62e"; - sha256 = "1q99m9xmdalnisnk4nixwgkkf2mq8s3vh4kd2kaxd2psg3a0a5dy"; + rev = "811730250fb2a1aba424dbbdde528d9087807feb"; + sha256 = "0ddn7s5kvkfjpj896al22il1sjjr1c3xzby353y1g3bvcjrli1ji"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; - lean-vim = buildVimPluginFrom2Nix { + lean-vim = buildVimPlugin { pname = "lean.vim"; version = "2021-09-29"; src = fetchFromGitHub { @@ -4821,7 +4821,7 @@ final: prev: meta.homepage = "https://github.com/leanprover/lean.vim/"; }; - leap-ast-nvim = buildVimPluginFrom2Nix { + leap-ast-nvim = buildVimPlugin { pname = "leap-ast.nvim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -4833,7 +4833,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap-ast.nvim/"; }; - leap-nvim = buildVimPluginFrom2Nix { + leap-nvim = buildVimPlugin { pname = "leap.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -4845,19 +4845,19 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; - legendary-nvim = buildVimPluginFrom2Nix { + legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2023-07-08"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3db15cae08d63bab40d0c38474e368f97414f090"; - sha256 = "1gkaj6baynds4nlas4i0kwd6w68byyclxp1slghccjfamaqlv3sn"; + rev = "bf39c4a792fb12dc29d825f072cb72aea5bce61b"; + sha256 = "03pjgi2bkkycadpwh7grmrl7lchgfg3g79q7iplw6s4p8rxvizs2"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; - lens-vim = buildVimPluginFrom2Nix { + lens-vim = buildVimPlugin { pname = "lens.vim"; version = "2021-05-30"; src = fetchFromGitHub { @@ -4869,7 +4869,7 @@ final: prev: meta.homepage = "https://github.com/camspiers/lens.vim/"; }; - lessspace-vim = buildVimPluginFrom2Nix { + lessspace-vim = buildVimPlugin { pname = "lessspace.vim"; version = "2023-02-13"; src = fetchFromGitHub { @@ -4881,7 +4881,7 @@ final: prev: meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; - lexima-vim = buildVimPluginFrom2Nix { + lexima-vim = buildVimPlugin { pname = "lexima.vim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -4893,7 +4893,7 @@ final: prev: meta.homepage = "https://github.com/cohama/lexima.vim/"; }; - lf-vim = buildVimPluginFrom2Nix { + lf-vim = buildVimPlugin { pname = "lf.vim"; version = "2022-08-24"; src = fetchFromGitHub { @@ -4905,7 +4905,7 @@ final: prev: meta.homepage = "https://github.com/ptzz/lf.vim/"; }; - lh-brackets = buildVimPluginFrom2Nix { + lh-brackets = buildVimPlugin { pname = "lh-brackets"; version = "2023-05-16"; src = fetchFromGitHub { @@ -4917,7 +4917,7 @@ final: prev: meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; - lh-vim-lib = buildVimPluginFrom2Nix { + lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; version = "2023-05-16"; src = fetchFromGitHub { @@ -4929,7 +4929,7 @@ final: prev: meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; - lightline-ale = buildVimPluginFrom2Nix { + lightline-ale = buildVimPlugin { pname = "lightline-ale"; version = "2021-06-09"; src = fetchFromGitHub { @@ -4941,7 +4941,7 @@ final: prev: meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; - lightline-bufferline = buildVimPluginFrom2Nix { + lightline-bufferline = buildVimPlugin { pname = "lightline-bufferline"; version = "2023-06-06"; src = fetchFromGitHub { @@ -4953,7 +4953,7 @@ final: prev: meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; - lightline-gruvbox-vim = buildVimPluginFrom2Nix { + lightline-gruvbox-vim = buildVimPlugin { pname = "lightline-gruvbox.vim"; version = "2023-04-02"; src = fetchFromGitHub { @@ -4965,7 +4965,7 @@ final: prev: meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; - lightline-lsp = buildVimPluginFrom2Nix { + lightline-lsp = buildVimPlugin { pname = "lightline-lsp"; version = "2023-03-15"; src = fetchFromGitHub { @@ -4977,7 +4977,7 @@ final: prev: meta.homepage = "https://github.com/spywhere/lightline-lsp/"; }; - lightline-vim = buildVimPluginFrom2Nix { + lightline-vim = buildVimPlugin { pname = "lightline.vim"; version = "2023-09-03"; src = fetchFromGitHub { @@ -4989,7 +4989,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; - lightspeed-nvim = buildVimPluginFrom2Nix { + lightspeed-nvim = buildVimPlugin { pname = "lightspeed.nvim"; version = "2022-10-21"; src = fetchFromGitHub { @@ -5001,7 +5001,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; - limelight-vim = buildVimPluginFrom2Nix { + limelight-vim = buildVimPlugin { pname = "limelight.vim"; version = "2022-08-03"; src = fetchFromGitHub { @@ -5013,7 +5013,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; - lingua-franca-vim = buildVimPluginFrom2Nix { + lingua-franca-vim = buildVimPlugin { pname = "lingua-franca.vim"; version = "2021-09-05"; src = fetchFromGitHub { @@ -5025,7 +5025,7 @@ final: prev: meta.homepage = "https://github.com/lf-lang/lingua-franca.vim/"; }; - lir-nvim = buildVimPluginFrom2Nix { + lir-nvim = buildVimPlugin { pname = "lir.nvim"; version = "2023-07-12"; src = fetchFromGitHub { @@ -5037,7 +5037,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; - lispdocs-nvim = buildVimPluginFrom2Nix { + lispdocs-nvim = buildVimPlugin { pname = "lispdocs.nvim"; version = "2022-07-05"; src = fetchFromGitHub { @@ -5049,7 +5049,7 @@ final: prev: meta.homepage = "https://github.com/kkharji/lispdocs.nvim/"; }; - litee-calltree-nvim = buildVimPluginFrom2Nix { + litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; version = "2022-09-28"; src = fetchFromGitHub { @@ -5061,7 +5061,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; - litee-filetree-nvim = buildVimPluginFrom2Nix { + litee-filetree-nvim = buildVimPlugin { pname = "litee-filetree.nvim"; version = "2022-09-27"; src = fetchFromGitHub { @@ -5073,7 +5073,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; - litee-symboltree-nvim = buildVimPluginFrom2Nix { + litee-symboltree-nvim = buildVimPlugin { pname = "litee-symboltree.nvim"; version = "2022-09-28"; src = fetchFromGitHub { @@ -5085,7 +5085,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; - litee-nvim = buildVimPluginFrom2Nix { + litee-nvim = buildVimPlugin { pname = "litee.nvim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -5097,7 +5097,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; - live-command-nvim = buildVimPluginFrom2Nix { + live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; version = "2023-06-05"; src = fetchFromGitHub { @@ -5109,7 +5109,7 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; - lsp-colors-nvim = buildVimPluginFrom2Nix { + lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; version = "2023-02-27"; src = fetchFromGitHub { @@ -5121,7 +5121,7 @@ final: prev: meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; - lsp-format-nvim = buildVimPluginFrom2Nix { + lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -5133,7 +5133,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; - lsp-inlayhints-nvim = buildVimPluginFrom2Nix { + lsp-inlayhints-nvim = buildVimPlugin { pname = "lsp-inlayhints.nvim"; version = "2023-06-08"; src = fetchFromGitHub { @@ -5145,19 +5145,19 @@ final: prev: meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; - lsp-overloads-nvim = buildVimPluginFrom2Nix { + lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2023-08-13"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "42d68e9f33dcda67591f0c406d98b480915f94ad"; - sha256 = "096z4wz51492qgbq7yazxpsbkzcb49acx9y4ifnwlb9zl1h6xsjj"; + rev = "f7afc7a66b5319036e84487240283fa7d8e1100d"; + sha256 = "15a6mnh5ivnllgiwvcs2qc9rrg1alh345yv129417rl0brf0n438"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; - lsp-rooter-nvim = buildVimPluginFrom2Nix { + lsp-rooter-nvim = buildVimPlugin { pname = "lsp-rooter.nvim"; version = "2021-08-13"; src = fetchFromGitHub { @@ -5169,7 +5169,7 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/lsp-rooter.nvim/"; }; - lsp-status-nvim = buildVimPluginFrom2Nix { + lsp-status-nvim = buildVimPlugin { pname = "lsp-status.nvim"; version = "2022-08-03"; src = fetchFromGitHub { @@ -5181,7 +5181,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; - lsp-zero-nvim = buildVimPluginFrom2Nix { + lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; version = "2023-08-23"; src = fetchFromGitHub { @@ -5193,7 +5193,7 @@ final: prev: meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; - lsp_extensions-nvim = buildVimPluginFrom2Nix { + lsp_extensions-nvim = buildVimPlugin { pname = "lsp_extensions.nvim"; version = "2022-07-07"; src = fetchFromGitHub { @@ -5205,30 +5205,30 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; - lsp_lines-nvim = buildVimPluginFrom2Nix { + lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2023-05-15"; + version = "2023-09-25"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "f53af96d4789eef39a082dbcce078d2bfc384ece"; - sha256 = "11nsp21n1lhjl6m4mgj1vdcvalik9dmvv8baflzd2njb5g3gc5v6"; + rev = "9e3f99fbbd28aaec80dc0158c43be8cca8dd5017"; + sha256 = "1rva0ykikkj8wssga5h0ccqarkvcvi9g2kgr3il889v3zsim7d2m"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; - lsp_signature-nvim = buildVimPluginFrom2Nix { + lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-09-11"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "51784ba4ce87b362c139b8c2db6583c0aec20536"; - sha256 = "10bbmwzsk882qp8x9c516v8jk73sslg0ac1vcqchkw3yc9gn73jc"; + rev = "33250c84c7a552daf28ac607d9d9e82f88cd0907"; + sha256 = "0cgfr6caj309r8qn8dclk1ql2wxkijqkfciwp8r5f306c8i04j2h"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; - lspcontainers-nvim = buildVimPluginFrom2Nix { + lspcontainers-nvim = buildVimPlugin { pname = "lspcontainers.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -5240,7 +5240,7 @@ final: prev: meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; - lspkind-nvim = buildVimPluginFrom2Nix { + lspkind-nvim = buildVimPlugin { pname = "lspkind-nvim"; version = "2023-05-05"; src = fetchFromGitHub { @@ -5252,19 +5252,19 @@ final: prev: meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; - lspsaga-nvim = buildVimPluginFrom2Nix { + lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-09-15"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "32c1b404489723771d385579d695b61cf12bf3a4"; - sha256 = "1i4f220r1m5sczbgzmm0bc8dzvbv9vwfy4qlsrcjv2jg9xgmapzj"; + rev = "8c7e03e2851cd16219b3b2d05192473ac07025a7"; + sha256 = "1m53dkr2wbf914jrbcpc8b9gj7grq5nnvlw6qq9gbsy98xf1l58j"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; - ltex_extra-nvim = buildVimPluginFrom2Nix { + ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -5276,7 +5276,7 @@ final: prev: meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; - lualine-lsp-progress = buildVimPluginFrom2Nix { + lualine-lsp-progress = buildVimPlugin { pname = "lualine-lsp-progress"; version = "2021-10-23"; src = fetchFromGitHub { @@ -5288,32 +5288,32 @@ final: prev: meta.homepage = "https://github.com/arkav/lualine-lsp-progress/"; }; - lualine-nvim = buildVimPluginFrom2Nix { + lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2023-08-03"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "45e27ca739c7be6c49e5496d14fcf45a303c3a63"; - sha256 = "1ixzh61d0rd8223qagd1k4bidv8jw4hsafy02idb7c1yg6fy5ixz"; + rev = "1a3f6bba410aff5a51bf8c84287aaa3a8ba30d0d"; + sha256 = "19p6fqwsg1z92k8g1rhrb3qxj4158nm5g124pla1a7ik7sr356mg"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; - luasnip = buildVimPluginFrom2Nix { + luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-08-31"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b"; - sha256 = "0r0k265m5nf0rl8hma13yjw8fyd08629h1awa94lk0s6dvk7mkh0"; + rev = "0df29db3543837f8b41597f2640397c5ec792b7b"; + sha256 = "05rczq2mj1bc1v8bdgj5pb0064f0lcmdl0fjkza5fijmsn082423"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; - luatab-nvim = buildVimPluginFrom2Nix { + luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -5327,17 +5327,17 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2023-08-03"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "a8f0f7b9f837887f13a61d67b40ae26188fe4d62"; - sha256 = "1zni7l5ldfv1inq30b7kqg1mv26558hif4nssawk5mjisjwdlwsp"; + rev = "966aad1accd47fa11fbe2539234f81f678fef2de"; + sha256 = "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; - lushtags = buildVimPluginFrom2Nix { + lushtags = buildVimPlugin { pname = "lushtags"; version = "2017-04-19"; src = fetchFromGitHub { @@ -5349,7 +5349,7 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; - magma-nvim-goose = buildVimPluginFrom2Nix { + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; src = fetchFromGitHub { @@ -5361,7 +5361,7 @@ final: prev: meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; - mark-radar-nvim = buildVimPluginFrom2Nix { + mark-radar-nvim = buildVimPlugin { pname = "mark-radar.nvim"; version = "2021-06-22"; src = fetchFromGitHub { @@ -5373,19 +5373,19 @@ final: prev: meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; }; - markdown-preview-nvim = buildVimPluginFrom2Nix { + markdown-preview-nvim = buildVimPlugin { pname = "markdown-preview.nvim"; - version = "2022-05-13"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "iamcco"; repo = "markdown-preview.nvim"; - rev = "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96"; - sha256 = "0hd51c7n8hr5bdhd8xl4gr4jgasdjr90rmcjaxylp475xyz6wl3v"; + rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; + sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; }; meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; - markid = buildVimPluginFrom2Nix { + markid = buildVimPlugin { pname = "markid"; version = "2023-07-01"; src = fetchFromGitHub { @@ -5397,7 +5397,7 @@ final: prev: meta.homepage = "https://github.com/David-Kunz/markid/"; }; - marks-nvim = buildVimPluginFrom2Nix { + marks-nvim = buildVimPlugin { pname = "marks.nvim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -5409,43 +5409,43 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; - mason-lspconfig-nvim = buildVimPluginFrom2Nix { + mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-09-14"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "f014db32437aa61c86fc0ef1067cd2bc6a37205c"; - sha256 = "0wagin4cr5rjjcnjlnh8z3g0sw7aml44y6wm3l9s170d7inqqylm"; + rev = "e7b64c11035aa924f87385b72145e0ccf68a7e0a"; + sha256 = "1khd5kicxm7dz5bv8jq9kqrmwp55xycf19v9scn4s30ym9cjm1r8"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; - mason-tool-installer-nvim = buildVimPluginFrom2Nix { + mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2023-07-13"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "031903fefbf59371502092ef9e22cab9161d90ba"; - sha256 = "1za6shsh5ykdv9ivf971b3ckfxk25p8lsd9qdgrmm5bag6vih8cl"; + rev = "e4f34741daa9cf95de68a603d3e7a6844a69fdf0"; + sha256 = "1pk19mlssn6f4pqm2j0kf9841nmxd0scphhrrd02w81gmsr912zh"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; - mason-nvim = buildVimPluginFrom2Nix { + mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2023-09-10"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a"; - sha256 = "01k4xxfmhdip6vniwj4lai7fqp5dyh799cfyrjqmqqxx25q7m8aj"; + rev = "cd7835b15f5a4204fc37e0aa739347472121a54c"; + sha256 = "0a915vj7vz87j9bgh431f3slmh6hfc23cixbcx2hy3z9azcaaqs9"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; - matchit-zip = buildVimPluginFrom2Nix { + matchit-zip = buildVimPlugin { pname = "matchit.zip"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5457,19 +5457,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; - material-nvim = buildVimPluginFrom2Nix { + material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-07-11"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "1ecaa2d065a1ea308bd7702a77c2bf35ede8f536"; - sha256 = "04fd3rm4lzf29vpma2ylh19qcsms81qs6nlzwji8la3d78zr09n3"; + rev = "dfa4bc5340a0f0d2dd5b1bf6c2ebd5bb570a9d71"; + sha256 = "16rj09fv7hjp17ni9xdg7v6qvc149sb6kkmdza6p2wkalpsnc8a2"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; - material-vim = buildVimPluginFrom2Nix { + material-vim = buildVimPlugin { pname = "material.vim"; version = "2023-02-09"; src = fetchFromGitHub { @@ -5481,7 +5481,7 @@ final: prev: meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; - mayansmoke = buildVimPluginFrom2Nix { + mayansmoke = buildVimPlugin { pname = "mayansmoke"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5493,7 +5493,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; - mediawiki-vim = buildVimPluginFrom2Nix { + mediawiki-vim = buildVimPlugin { pname = "mediawiki.vim"; version = "2015-11-15"; src = fetchFromGitHub { @@ -5505,7 +5505,7 @@ final: prev: meta.homepage = "https://github.com/chikamichi/mediawiki.vim/"; }; - melange-nvim = buildVimPluginFrom2Nix { + melange-nvim = buildVimPlugin { pname = "melange-nvim"; version = "2023-08-11"; src = fetchFromGitHub { @@ -5517,7 +5517,7 @@ final: prev: meta.homepage = "https://github.com/savq/melange-nvim/"; }; - mind-nvim = buildVimPluginFrom2Nix { + mind-nvim = buildVimPlugin { pname = "mind.nvim"; version = "2023-03-22"; src = fetchFromGitHub { @@ -5529,31 +5529,31 @@ final: prev: meta.homepage = "https://github.com/phaazon/mind.nvim/"; }; - mini-nvim = buildVimPluginFrom2Nix { + mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-09-14"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e2273ec6186a7af206cc73de10970c0c3867c46d"; - sha256 = "0rry8fiyinjgp0s6qphdixra1wgg01k8da1xb8qcd39qx0nrlpf2"; + rev = "22f3f4396b4ec90c4c83b69f47e14d71b4c6c69f"; + sha256 = "1gvdzljf74ji9q8x0ach0rsp1c5a93lp3i6dx9g9gca94m5phwbq"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; - minimap-vim = buildVimPluginFrom2Nix { + minimap-vim = buildVimPlugin { pname = "minimap.vim"; - version = "2023-07-25"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "74573b63b9ef0583262b6bf6ef209eb7f3b06b94"; - sha256 = "040z12dxagbfsbkdwpsz6dk2vpak3z737ra5ipb1ljqsswgrj5f9"; + rev = "701f4cf4b60a3e1685d2da484282f3a3d8bf9db6"; + sha256 = "1kgzg69v9gsl0whq7740av3iyih0z460l42js5jxl8mg630bzxbc"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; - mkdir-nvim = buildVimPluginFrom2Nix { + mkdir-nvim = buildVimPlugin { pname = "mkdir.nvim"; version = "2022-07-23"; src = fetchFromGitHub { @@ -5565,31 +5565,31 @@ final: prev: meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; - mkdnflow-nvim = buildVimPluginFrom2Nix { + mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-07-05"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "a728a3533bb57502fdfd6fdb4e5839fc87430edc"; - sha256 = "18zzwij973ar8jqmxvv9rv8r3lhvvjy2i61x1052jkkm3d9j59jk"; + rev = "f7e513a521f5926df034cf40ddd54b43ba73a013"; + sha256 = "1kc832ngkmzkzq4zzc910claf71f1brb71ypip2y5xjwmpqb90n1"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; - mkdx = buildVimPluginFrom2Nix { + mkdx = buildVimPlugin { pname = "mkdx"; - version = "2023-08-23"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "4a8067468b4372d58f519eb55708b524a893d67d"; - sha256 = "19x472gv6x7pz3ln91s2n4r31b0s435g5rzwrdvzv5dmairgxxiq"; + rev = "ee667cad506954b706c3fa972fbaaad46b1bf028"; + sha256 = "1yl7ch7ylgjm1fpk7kc5260lk58922bg9ygg2x8a7r5k1glxx71j"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; - modicator-nvim = buildVimPluginFrom2Nix { + modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; version = "2023-08-25"; src = fetchFromGitHub { @@ -5601,7 +5601,7 @@ final: prev: meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; - molokai = buildVimPluginFrom2Nix { + molokai = buildVimPlugin { pname = "molokai"; version = "2015-11-11"; src = fetchFromGitHub { @@ -5613,19 +5613,19 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; - monokai-pro-nvim = buildVimPluginFrom2Nix { + monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-09-05"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "488a0152331c59a33d7f8bdef6eb88dae299c808"; - sha256 = "1nmak9fp7mkbwxrmd3h23468ywsdfcjfyq29p0c4nhglyxlnqhal"; + rev = "6b3bf9a4e0c988471969f62b36486023b33dd963"; + sha256 = "1frrsxvvklq6lpwclqsknqwpca1bgb13ijwj17x2x69bnzd13vhi"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; - moonscript-vim = buildVimPluginFrom2Nix { + moonscript-vim = buildVimPlugin { pname = "moonscript-vim"; version = "2016-11-22"; src = fetchFromGitHub { @@ -5637,7 +5637,7 @@ final: prev: meta.homepage = "https://github.com/leafo/moonscript-vim/"; }; - mru = buildVimPluginFrom2Nix { + mru = buildVimPlugin { pname = "mru"; version = "2023-05-27"; src = fetchFromGitHub { @@ -5649,19 +5649,19 @@ final: prev: meta.homepage = "https://github.com/yegappan/mru/"; }; - multicursors-nvim = buildVimPluginFrom2Nix { + multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-09-16"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b7a837496da6f5b39b610a7cbd6c3f7d05526d6e"; - sha256 = "0mf282j3xq76h7jzgyy7wgbjw17vglx49ybrjxn08bix9vnvx1y4"; + rev = "38b06771cc6e867092a7d161096ab4e11bec182d"; + sha256 = "04b4h4b4m5dd2r9srym4zs6myd70f43hwxd4zpwnia5l24b52m06"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; - nabla-nvim = buildVimPluginFrom2Nix { + nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; version = "2023-04-22"; src = fetchFromGitHub { @@ -5673,7 +5673,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; }; - ncm2 = buildVimPluginFrom2Nix { + ncm2 = buildVimPlugin { pname = "ncm2"; version = "2022-03-17"; src = fetchFromGitHub { @@ -5685,7 +5685,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2/"; }; - ncm2-bufword = buildVimPluginFrom2Nix { + ncm2-bufword = buildVimPlugin { pname = "ncm2-bufword"; version = "2019-01-19"; src = fetchFromGitHub { @@ -5697,7 +5697,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-bufword/"; }; - ncm2-cssomni = buildVimPluginFrom2Nix { + ncm2-cssomni = buildVimPlugin { pname = "ncm2-cssomni"; version = "2018-07-09"; src = fetchFromGitHub { @@ -5709,7 +5709,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-cssomni/"; }; - ncm2-dictionary = buildVimPluginFrom2Nix { + ncm2-dictionary = buildVimPlugin { pname = "ncm2-dictionary"; version = "2018-11-15"; src = fetchFromGitHub { @@ -5721,7 +5721,7 @@ final: prev: meta.homepage = "https://github.com/yuki-yano/ncm2-dictionary/"; }; - ncm2-github = buildVimPluginFrom2Nix { + ncm2-github = buildVimPlugin { pname = "ncm2-github"; version = "2018-08-01"; src = fetchFromGitHub { @@ -5733,7 +5733,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-github/"; }; - ncm2-html-subscope = buildVimPluginFrom2Nix { + ncm2-html-subscope = buildVimPlugin { pname = "ncm2-html-subscope"; version = "2018-07-01"; src = fetchFromGitHub { @@ -5745,7 +5745,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-html-subscope/"; }; - ncm2-jedi = buildVimPluginFrom2Nix { + ncm2-jedi = buildVimPlugin { pname = "ncm2-jedi"; version = "2021-01-05"; src = fetchFromGitHub { @@ -5757,7 +5757,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; - ncm2-markdown-subscope = buildVimPluginFrom2Nix { + ncm2-markdown-subscope = buildVimPlugin { pname = "ncm2-markdown-subscope"; version = "2020-03-09"; src = fetchFromGitHub { @@ -5769,7 +5769,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-markdown-subscope/"; }; - ncm2-neoinclude = buildVimPluginFrom2Nix { + ncm2-neoinclude = buildVimPlugin { pname = "ncm2-neoinclude"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5781,7 +5781,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-neoinclude/"; }; - ncm2-neosnippet = buildVimPluginFrom2Nix { + ncm2-neosnippet = buildVimPlugin { pname = "ncm2-neosnippet"; version = "2021-10-08"; src = fetchFromGitHub { @@ -5793,7 +5793,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-neosnippet/"; }; - ncm2-path = buildVimPluginFrom2Nix { + ncm2-path = buildVimPlugin { pname = "ncm2-path"; version = "2019-02-20"; src = fetchFromGitHub { @@ -5805,7 +5805,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-path/"; }; - ncm2-syntax = buildVimPluginFrom2Nix { + ncm2-syntax = buildVimPlugin { pname = "ncm2-syntax"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5817,7 +5817,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-syntax/"; }; - ncm2-tagprefix = buildVimPluginFrom2Nix { + ncm2-tagprefix = buildVimPlugin { pname = "ncm2-tagprefix"; version = "2018-11-08"; src = fetchFromGitHub { @@ -5829,7 +5829,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-tagprefix/"; }; - ncm2-tmux = buildVimPluginFrom2Nix { + ncm2-tmux = buildVimPlugin { pname = "ncm2-tmux"; version = "2019-01-11"; src = fetchFromGitHub { @@ -5841,7 +5841,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-tmux/"; }; - ncm2-ultisnips = buildVimPluginFrom2Nix { + ncm2-ultisnips = buildVimPlugin { pname = "ncm2-ultisnips"; version = "2019-01-26"; src = fetchFromGitHub { @@ -5853,7 +5853,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/"; }; - ncm2-vim = buildVimPluginFrom2Nix { + ncm2-vim = buildVimPlugin { pname = "ncm2-vim"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5865,7 +5865,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-vim/"; }; - neco-ghc = buildVimPluginFrom2Nix { + neco-ghc = buildVimPlugin { pname = "neco-ghc"; version = "2021-02-22"; src = fetchFromGitHub { @@ -5877,7 +5877,7 @@ final: prev: meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; - neco-look = buildVimPluginFrom2Nix { + neco-look = buildVimPlugin { pname = "neco-look"; version = "2021-07-26"; src = fetchFromGitHub { @@ -5889,7 +5889,7 @@ final: prev: meta.homepage = "https://github.com/ujihisa/neco-look/"; }; - neco-syntax = buildVimPluginFrom2Nix { + neco-syntax = buildVimPlugin { pname = "neco-syntax"; version = "2020-09-13"; src = fetchFromGitHub { @@ -5901,7 +5901,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; - neco-vim = buildVimPluginFrom2Nix { + neco-vim = buildVimPlugin { pname = "neco-vim"; version = "2023-08-15"; src = fetchFromGitHub { @@ -5913,19 +5913,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/neco-vim/"; }; - neo-tree-nvim = buildVimPluginFrom2Nix { + neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-09-16"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "54fe2a5f6f698094b34461a11370fcc29b8a4393"; - sha256 = "18y0saknah3hhxjjqprk608m0y1ccqs03rjs29q6yv7lin1mwxy2"; + rev = "63ebe879ad4798b66d29c0b2c8d04942389d438e"; + sha256 = "1cn944l0mi7jvvrnybc4cs16gxqvqwyxxmjgc4wbmgw75q0867zp"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; - neocomplete-vim = buildVimPluginFrom2Nix { + neocomplete-vim = buildVimPlugin { pname = "neocomplete.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -5937,19 +5937,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; - neoconf-nvim = buildVimPluginFrom2Nix { + neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-09-16"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "a4eb3675cb87be2e2dcb283dddc8c7aabd2c50ca"; - sha256 = "0kqm855707llmacig446q809gplwddp98vgsxz00c0gbgvpb7r33"; + rev = "c87c862a14a4c8c0e2bc823d304e4da472fd7180"; + sha256 = "0cs33366wylq4k88hhqpxq69kj5pm3hwbi89gf0y6w3q0491rjkh"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; - neodark-vim = buildVimPluginFrom2Nix { + neodark-vim = buildVimPlugin { pname = "neodark.vim"; version = "2023-07-15"; src = fetchFromGitHub { @@ -5961,31 +5961,31 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; - neodev-nvim = buildVimPluginFrom2Nix { + neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-09-15"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "471324e6c746284dbbdc1d357799d1911bb7e120"; - sha256 = "156lr9mrvwg0b5p933617yhdzdygsgcrayw94sq1zxhqpwc9zbjz"; + rev = "24b403eabde652904077f84fd55441744e77a109"; + sha256 = "06jvqmdzs5g83fhkymbqmf0kxgia36m6h8x35idz41h4y3mlnzw5"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; - neoformat = buildVimPluginFrom2Nix { + neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-08-20"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "0c285d7a7c06a6ee88db70871a274797693fce42"; - sha256 = "1vmgj3dd728wbg4hxzaqrvzypbpkxhawdsqy43lp1bbq27b008bf"; + rev = "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0"; + sha256 = "09lk5q7zfvjcfvijk3pr830zl602j3i06zil148fwhkghig0flkg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; - neogen = buildVimPluginFrom2Nix { + neogen = buildVimPlugin { pname = "neogen"; version = "2023-09-09"; src = fetchFromGitHub { @@ -5997,19 +5997,19 @@ final: prev: meta.homepage = "https://github.com/danymat/neogen/"; }; - neogit = buildVimPluginFrom2Nix { + neogit = buildVimPlugin { pname = "neogit"; - version = "2023-09-15"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "9d9355137b1e2503a47fedfc395e75a8330163e8"; - sha256 = "1ma0yfff1nk091yhs092qvgb2qm86ly4x19ahijj8xa7q85v6p4p"; + rev = "eb9d6b8f0840e4f2fa775bca7ec4a5df8b42ed6d"; + sha256 = "0pf6fq5xbai7lq451y8mmkiab1zhr15g5w9kyz9kd46xk7rcmx8a"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; - neoinclude-vim = buildVimPluginFrom2Nix { + neoinclude-vim = buildVimPlugin { pname = "neoinclude.vim"; version = "2020-09-13"; src = fetchFromGitHub { @@ -6021,7 +6021,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; - neomake = buildVimPluginFrom2Nix { + neomake = buildVimPlugin { pname = "neomake"; version = "2023-02-20"; src = fetchFromGitHub { @@ -6033,7 +6033,7 @@ final: prev: meta.homepage = "https://github.com/neomake/neomake/"; }; - neomru-vim = buildVimPluginFrom2Nix { + neomru-vim = buildVimPlugin { pname = "neomru.vim"; version = "2020-02-05"; src = fetchFromGitHub { @@ -6045,7 +6045,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; - neon = buildVimPluginFrom2Nix { + neon = buildVimPlugin { pname = "neon"; version = "2022-11-27"; src = fetchFromGitHub { @@ -6057,7 +6057,7 @@ final: prev: meta.homepage = "https://github.com/rafamadriz/neon/"; }; - neorepl-nvim = buildVimPluginFrom2Nix { + neorepl-nvim = buildVimPlugin { pname = "neorepl.nvim"; version = "2022-11-07"; src = fetchFromGitHub { @@ -6069,19 +6069,19 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPluginFrom2Nix { + neorg = buildVimPlugin { pname = "neorg"; - version = "2023-09-15"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "069cf8a460594ca6f4233c83aac1a31a96c62d98"; - sha256 = "0a1gr33nr8fagipfmhl98jdpafgc8czi5w3ixbn1nazwigjp3air"; + rev = "7c4e09d39d6be4494e8c2980a55837d982c8ef4b"; + sha256 = "1kws0xgqsqnw8iz9gb1r9h30z97p1sglmxzh1jrf27m9qcirm49w"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; - neorg-telescope = buildVimPluginFrom2Nix { + neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; version = "2023-08-06"; src = fetchFromGitHub { @@ -6093,7 +6093,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; - neoscroll-nvim = buildVimPluginFrom2Nix { + neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; version = "2023-08-10"; src = fetchFromGitHub { @@ -6105,7 +6105,7 @@ final: prev: meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; - neosnippet-snippets = buildVimPluginFrom2Nix { + neosnippet-snippets = buildVimPlugin { pname = "neosnippet-snippets"; version = "2022-04-01"; src = fetchFromGitHub { @@ -6117,7 +6117,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; - neosnippet-vim = buildVimPluginFrom2Nix { + neosnippet-vim = buildVimPlugin { pname = "neosnippet.vim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -6129,7 +6129,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; - neoterm = buildVimPluginFrom2Nix { + neoterm = buildVimPlugin { pname = "neoterm"; version = "2023-03-09"; src = fetchFromGitHub { @@ -6141,7 +6141,7 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; - neotest = buildVimPluginFrom2Nix { + neotest = buildVimPlugin { pname = "neotest"; version = "2023-09-10"; src = fetchFromGitHub { @@ -6153,7 +6153,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; - neotest-dart = buildVimPluginFrom2Nix { + neotest-dart = buildVimPlugin { pname = "neotest-dart"; version = "2023-08-27"; src = fetchFromGitHub { @@ -6165,7 +6165,7 @@ final: prev: meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; - neotest-deno = buildVimPluginFrom2Nix { + neotest-deno = buildVimPlugin { pname = "neotest-deno"; version = "2022-12-09"; src = fetchFromGitHub { @@ -6177,19 +6177,19 @@ final: prev: meta.homepage = "https://github.com/MarkEmmons/neotest-deno/"; }; - neotest-dotnet = buildVimPluginFrom2Nix { + neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2023-08-13"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "6528e761e4528aed3f4b60aff4c9f3406beb3cdd"; - sha256 = "0xp4bgsk3kh2bbyq67l7kvflzjbkxkzhdzq34pvbmjvhhsrrifz9"; + rev = "cee23e39d941b2deb14182d5a890144be6aa6164"; + sha256 = "14glp3pifjjfgppcgiw7fpcr7s9y40ffc0wxmgpg07gk2wy6qb4r"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; - neotest-elixir = buildVimPluginFrom2Nix { + neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; version = "2023-08-23"; src = fetchFromGitHub { @@ -6202,7 +6202,7 @@ final: prev: meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; }; - neotest-go = buildVimPluginFrom2Nix { + neotest-go = buildVimPlugin { pname = "neotest-go"; version = "2023-09-10"; src = fetchFromGitHub { @@ -6214,31 +6214,31 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; - neotest-haskell = buildVimPluginFrom2Nix { + neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-09-11"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "cda6f5ab76f63e9f24b0008f7df9525ded5e8721"; - sha256 = "0xa4qzcaik7hpiv3dv1n7nb15640qnh70ggwzkbp30yhjqb3rjn6"; + rev = "d3ef9c96c4e4355383a83abd56255c2086feae65"; + sha256 = "01rnfbl8n08dblxkz2yvy7lbffpg8134fvp4iii5v32rk73i4zsr"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; - neotest-jest = buildVimPluginFrom2Nix { + neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-09-03"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "ae559fbd405084ee38dd711eede6d74f3dc1d463"; - sha256 = "032q6cm470y64y3crb7p35ap1r6p8dqh6wgwk5aq5xyfr8c07vbj"; + rev = "65ab61c77aa1c245f16982ffe1a4d31589e18023"; + sha256 = "168597vm0645c3n6lijw18308kn6lhjp5k9jcnlc0jg640znczsf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; - neotest-pest = buildVimPluginFrom2Nix { + neotest-pest = buildVimPlugin { pname = "neotest-pest"; version = "2022-11-24"; src = fetchFromGitHub { @@ -6250,7 +6250,7 @@ final: prev: meta.homepage = "https://github.com/theutz/neotest-pest/"; }; - neotest-phpunit = buildVimPluginFrom2Nix { + neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; version = "2023-06-04"; src = fetchFromGitHub { @@ -6262,19 +6262,19 @@ final: prev: meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; - neotest-plenary = buildVimPluginFrom2Nix { + neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2023-04-27"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "e0d9b1530307a03abcc52fc0ae28f054dea3f752"; - sha256 = "1d5ay6jbc8f10zp7nffx67d627389szr8zkvdx02pzq21m9dsv92"; + rev = "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584"; + sha256 = "01dg3n3bnhc1ppai24syq48n5xkm1a3vm731xrah2y0qi390q0l3"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; - neotest-python = buildVimPluginFrom2Nix { + neotest-python = buildVimPlugin { pname = "neotest-python"; version = "2023-08-25"; src = fetchFromGitHub { @@ -6286,31 +6286,31 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; - neotest-rspec = buildVimPluginFrom2Nix { + neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-08-25"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "5638880f0adcdb5366fe57a477dfa94074463709"; - sha256 = "17104fdfiv8iw9g2l2yvkakmqa1pkyb6dj6yh5qnczpylwilkgci"; + rev = "51a3b866d85733d2df2c6b5a16d75ce6ed2fbade"; + sha256 = "028qqd0ywlf93ndy3vqp6pj9pbp3nsibdnkmg3b45g1phc49hbrw"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; - neotest-rust = buildVimPluginFrom2Nix { + neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-09-16"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "c8894d826a2cb5003cb6bc0a2fa8f7a359899130"; - sha256 = "1awrcpdaz1bn8bqfxg0wv7gh1bg9kvan45m8yv4l3m4g8xs7fq1d"; + rev = "03e036a310379f132d4e39387e9076396132ce3f"; + sha256 = "1s3816q710qymv62zz6vld178lmfqgfh8wq5s0hcc26rpk8ap85h"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; - neotest-scala = buildVimPluginFrom2Nix { + neotest-scala = buildVimPlugin { pname = "neotest-scala"; version = "2022-10-15"; src = fetchFromGitHub { @@ -6322,7 +6322,7 @@ final: prev: meta.homepage = "https://github.com/stevanmilic/neotest-scala/"; }; - neotest-testthat = buildVimPluginFrom2Nix { + neotest-testthat = buildVimPlugin { pname = "neotest-testthat"; version = "2022-07-04"; src = fetchFromGitHub { @@ -6334,7 +6334,7 @@ final: prev: meta.homepage = "https://github.com/shunsambongi/neotest-testthat/"; }; - neotest-vitest = buildVimPluginFrom2Nix { + neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; version = "2023-06-23"; src = fetchFromGitHub { @@ -6346,7 +6346,7 @@ final: prev: meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; - neovim-ayu = buildVimPluginFrom2Nix { + neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; version = "2023-06-29"; src = fetchFromGitHub { @@ -6358,7 +6358,7 @@ final: prev: meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; - neovim-fuzzy = buildVimPluginFrom2Nix { + neovim-fuzzy = buildVimPlugin { pname = "neovim-fuzzy"; version = "2023-01-25"; src = fetchFromGitHub { @@ -6370,7 +6370,7 @@ final: prev: meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; - neovim-sensible = buildVimPluginFrom2Nix { + neovim-sensible = buildVimPlugin { pname = "neovim-sensible"; version = "2017-09-20"; src = fetchFromGitHub { @@ -6382,7 +6382,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/neovim-sensible/"; }; - neoyank-vim = buildVimPluginFrom2Nix { + neoyank-vim = buildVimPlugin { pname = "neoyank.vim"; version = "2020-12-20"; src = fetchFromGitHub { @@ -6394,7 +6394,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; - nerdcommenter = buildVimPluginFrom2Nix { + nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; version = "2023-08-12"; src = fetchFromGitHub { @@ -6406,7 +6406,7 @@ final: prev: meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; - nerdtree = buildVimPluginFrom2Nix { + nerdtree = buildVimPlugin { pname = "nerdtree"; version = "2023-09-04"; src = fetchFromGitHub { @@ -6418,7 +6418,7 @@ final: prev: meta.homepage = "https://github.com/preservim/nerdtree/"; }; - nerdtree-git-plugin = buildVimPluginFrom2Nix { + nerdtree-git-plugin = buildVimPlugin { pname = "nerdtree-git-plugin"; version = "2021-08-18"; src = fetchFromGitHub { @@ -6430,7 +6430,7 @@ final: prev: meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; - netman-nvim = buildVimPluginFrom2Nix { + netman-nvim = buildVimPlugin { pname = "netman.nvim"; version = "2023-04-19"; src = fetchFromGitHub { @@ -6442,7 +6442,7 @@ final: prev: meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; - neuron-nvim = buildVimPluginFrom2Nix { + neuron-nvim = buildVimPlugin { pname = "neuron.nvim"; version = "2022-02-27"; src = fetchFromGitHub { @@ -6454,7 +6454,7 @@ final: prev: meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; - neuron-vim = buildVimPluginFrom2Nix { + neuron-vim = buildVimPlugin { pname = "neuron.vim"; version = "2023-07-06"; src = fetchFromGitHub { @@ -6466,7 +6466,7 @@ final: prev: meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; - nginx-vim = buildVimPluginFrom2Nix { + nginx-vim = buildVimPlugin { pname = "nginx.vim"; version = "2023-01-25"; src = fetchFromGitHub { @@ -6478,19 +6478,19 @@ final: prev: meta.homepage = "https://github.com/chr4/nginx.vim/"; }; - nightfox-nvim = buildVimPluginFrom2Nix { + nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-09-05"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "e886e39e592e89f316536a6f070365a9d88901c9"; - sha256 = "08jdrfjkjx6gkf17h8wh7swnjg19bagb0lxcdhg4bsgb87mbi99v"; + rev = "6a6076bd678f825ffbe16ec97807793c3167f1a7"; + sha256 = "1p1gp2p08mh0z7ckr63lw76ac91pssv0k2jczwpkibqmpp4imwnx"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; - nim-vim = buildVimPluginFrom2Nix { + nim-vim = buildVimPlugin { pname = "nim.vim"; version = "2021-11-11"; src = fetchFromGitHub { @@ -6502,7 +6502,7 @@ final: prev: meta.homepage = "https://github.com/zah/nim.vim/"; }; - nix-develop-nvim = buildVimPluginFrom2Nix { + nix-develop-nvim = buildVimPlugin { pname = "nix-develop.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -6514,7 +6514,7 @@ final: prev: meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; - nlsp-settings-nvim = buildVimPluginFrom2Nix { + nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; version = "2023-08-23"; src = fetchFromGitHub { @@ -6526,7 +6526,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; - nlua-nvim = buildVimPluginFrom2Nix { + nlua-nvim = buildVimPlugin { pname = "nlua.nvim"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6538,7 +6538,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; - nnn-vim = buildVimPluginFrom2Nix { + nnn-vim = buildVimPlugin { pname = "nnn.vim"; version = "2023-05-23"; src = fetchFromGitHub { @@ -6550,43 +6550,55 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; - no-neck-pain-nvim = buildVimPluginFrom2Nix { + no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-06-24"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "fb27d3bff0834d9178250b439d46bfa04b4e1ae2"; - sha256 = "0ri8qwhx4fsrs3im01nr0v05pg3c17k7zfgdmps61s6f1n0rpjf4"; + rev = "b4ed648483f96f6f212de3b9e38a8bb0d8c5255f"; + sha256 = "0xk759df6mczz013igiv0n5g8g8w426zk12l7b9kgrsl3bwf9hrw"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; - noice-nvim = buildVimPluginFrom2Nix { + noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-08-30"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "74c2902146b080035beb19944baf6f014a954720"; - sha256 = "10sjrxvnhrx1bi77lcdn5qz9kww4qcanajqzp2v8d3jlm5p2cc2c"; + rev = "e50fc6de68333633fa9eaaa54cb4cdfe7de5f25a"; + sha256 = "018cmk4ypx02z1574jp7w4ja4q1qvhbnv392yjgqlqfdkijr2man"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; - nord-nvim = buildVimPluginFrom2Nix { + none-ls-nvim = buildVimPlugin { + pname = "none-ls.nvim"; + version = "2023-10-07"; + src = fetchFromGitHub { + owner = "nvimtools"; + repo = "none-ls.nvim"; + rev = "ae339f45590cc421a68de885fc5a3261cc247362"; + sha256 = "1ymhga4pv1xjvzlpxqc6knzr58h5w94b6ljqbvm68ybhhqbpdq73"; + }; + meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; + }; + + nord-nvim = buildVimPlugin { pname = "nord.nvim"; - version = "2023-08-30"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "15fbfc38a83980b93e169b32a1bf64757f1e2bf4"; - sha256 = "077mr9gz4bsk0fz7vmzc9b68kysdax5vrlwfh7rhdam8qqlpncm7"; + rev = "0a22a387c92bb3b46e3d245522712ae7497bec38"; + sha256 = "1bmmyf3d4ihiaa0h9q77scif22kykkidks72vmamzh7v34x3c7d8"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; - nordic-nvim = buildVimPluginFrom2Nix { + nordic-nvim = buildVimPlugin { pname = "nordic.nvim"; version = "2022-12-08"; src = fetchFromGitHub { @@ -6598,7 +6610,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; - notifier-nvim = buildVimPluginFrom2Nix { + notifier-nvim = buildVimPlugin { pname = "notifier.nvim"; version = "2023-06-09"; src = fetchFromGitHub { @@ -6610,7 +6622,7 @@ final: prev: meta.homepage = "https://github.com/vigoux/notifier.nvim/"; }; - nterm-nvim = buildVimPluginFrom2Nix { + nterm-nvim = buildVimPlugin { pname = "nterm.nvim"; version = "2022-05-10"; src = fetchFromGitHub { @@ -6622,19 +6634,19 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; - nui-nvim = buildVimPluginFrom2Nix { + nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2023-09-06"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "c8de23342caf8d50b15d6b28368d36a56a69d76f"; - sha256 = "0na7mi192alj1pyskdyivn12a0nmcmzy79kmqxyz8r1cijgb33q2"; + rev = "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32"; + sha256 = "0x3bf63d4xblpvjirnhsk4ifb58rw6wprmj86dsfqjzls37fw6m5"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; - null-ls-nvim = buildVimPluginFrom2Nix { + null-ls-nvim = buildVimPlugin { pname = "null-ls.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -6646,7 +6658,7 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; - numb-nvim = buildVimPluginFrom2Nix { + numb-nvim = buildVimPlugin { pname = "numb.nvim"; version = "2023-08-25"; src = fetchFromGitHub { @@ -6658,19 +6670,19 @@ final: prev: meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; - nvchad = buildVimPluginFrom2Nix { + nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-09-16"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "3091ea58359bb85f087499bd73fbc0a57a935c34"; - sha256 = "0vfgh6a459jqlmsjnnf6dwkm1mqim3g6znlkbgdlizrlm16hfj5n"; + rev = "c56f1242dfc9c1fbba71fc3a22448d5d563703e0"; + sha256 = "0vkk8d9v3x7m7612z8r3nrmwxj25vwbv67wc2vjn0yfahmagf0fy"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; - nvcode-color-schemes-vim = buildVimPluginFrom2Nix { + nvcode-color-schemes-vim = buildVimPlugin { pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; src = fetchFromGitHub { @@ -6682,7 +6694,7 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; - nvim-FeMaco-lua = buildVimPluginFrom2Nix { + nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; version = "2023-08-28"; src = fetchFromGitHub { @@ -6694,7 +6706,7 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; - nvim-ale-diagnostic = buildVimPluginFrom2Nix { + nvim-ale-diagnostic = buildVimPlugin { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; src = fetchFromGitHub { @@ -6706,31 +6718,31 @@ final: prev: meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; - nvim-autopairs = buildVimPluginFrom2Nix { + nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-09-08"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "defad64afbf19381fe31488a7582bbac421d6e38"; - sha256 = "05ihrriym44g01rryaah2h2xnl183dpwcsf8q8rxzr29z0jpxxip"; + rev = "f6c71641f6f183427a651c0ce4ba3fb89404fa9e"; + sha256 = "0hi0p2036w23sins0aldiws1rq0zhgz0xa8bpf49gb37ryz02385"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; - nvim-base16 = buildVimPluginFrom2Nix { + nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2023-09-12"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "96e308958625a84940d5e443475465abf99c7bd9"; - sha256 = "1cz3nby9l2fg9ppl8pbgbcz70yzj87rci2lbzy9qm2mbj5y232sf"; + rev = "0b62f6e40e213e9e60b913ebd3be73373fc145d1"; + sha256 = "1nny4514fvnf9m5j55gqqdcf77qc0486a80j9x9ljx10mx0jbq4v"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; - nvim-biscuits = buildVimPluginFrom2Nix { + nvim-biscuits = buildVimPlugin { pname = "nvim-biscuits"; version = "2023-03-28"; src = fetchFromGitHub { @@ -6742,19 +6754,19 @@ final: prev: meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; - nvim-bqf = buildVimPluginFrom2Nix { + nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2023-09-12"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "a906a9dfc1bd7b3ac51ac954e32e157ffad9a7cd"; - sha256 = "03zn97fwhw661xfmj9mcvskryph12a7lh6sflcapd0pdx2fwbr7l"; + rev = "8784eebf34371049b641646d00232c2603215297"; + sha256 = "1vrp72kc1f1rkfdb9xnmd792l4h1j7vrnhf99l54pi700dnbjzcg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; - nvim-bufdel = buildVimPluginFrom2Nix { + nvim-bufdel = buildVimPlugin { pname = "nvim-bufdel"; version = "2023-04-13"; src = fetchFromGitHub { @@ -6766,7 +6778,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; - nvim-cm-racer = buildVimPluginFrom2Nix { + nvim-cm-racer = buildVimPlugin { pname = "nvim-cm-racer"; version = "2017-07-27"; src = fetchFromGitHub { @@ -6790,7 +6802,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; - nvim-code-action-menu = buildVimPluginFrom2Nix { + nvim-code-action-menu = buildVimPlugin { pname = "nvim-code-action-menu"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6802,19 +6814,19 @@ final: prev: meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; - nvim-cokeline = buildVimPluginFrom2Nix { + nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-09-08"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "dae7f8d04a2a4a999adc19858d3748ee9229831d"; - sha256 = "0fa0ahb1alagdmdnk6fiivdgcplm3fw40bpv51i4975gbhdj7ibd"; + rev = "857549678b426259af8e6fba52505e6a0f4f8e25"; + sha256 = "14x79mwnsr0vinhacv3ll06jsylqaq2ybw231acmq0vnz3cmkxiv"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; - nvim-colorizer-lua = buildVimPluginFrom2Nix { + nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; version = "2023-02-27"; src = fetchFromGitHub { @@ -6826,7 +6838,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; - nvim-comment = buildVimPluginFrom2Nix { + nvim-comment = buildVimPlugin { pname = "nvim-comment"; version = "2022-08-09"; src = fetchFromGitHub { @@ -6838,7 +6850,7 @@ final: prev: meta.homepage = "https://github.com/terrortylor/nvim-comment/"; }; - nvim-compe = buildVimPluginFrom2Nix { + nvim-compe = buildVimPlugin { pname = "nvim-compe"; version = "2021-10-02"; src = fetchFromGitHub { @@ -6850,7 +6862,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; - nvim-completion-manager = buildVimPluginFrom2Nix { + nvim-completion-manager = buildVimPlugin { pname = "nvim-completion-manager"; version = "2018-07-27"; src = fetchFromGitHub { @@ -6862,7 +6874,7 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; - nvim-config-local = buildVimPluginFrom2Nix { + nvim-config-local = buildVimPlugin { pname = "nvim-config-local"; version = "2023-06-15"; src = fetchFromGitHub { @@ -6874,19 +6886,19 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-config-local/"; }; - nvim-coverage = buildVimPluginFrom2Nix { + nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; - version = "2023-07-20"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "andythigpen"; repo = "nvim-coverage"; - rev = "4634dfb00961a86948518c7e6f85737c24364308"; - sha256 = "0ry8b5945spz00scab6xxs8va56yg17q1dd6g90k3zm9gvdi0r79"; + rev = "fd6f94781c94958d1c26353d0d43a82ea5572b31"; + sha256 = "05dk21s809mx586w6wvam31ihpc2ybwvi28b1jmjgppxj4v9qwr3"; }; meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; - nvim-cursorline = buildVimPluginFrom2Nix { + nvim-cursorline = buildVimPlugin { pname = "nvim-cursorline"; version = "2022-04-15"; src = fetchFromGitHub { @@ -6898,31 +6910,31 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; }; - nvim-dap = buildVimPluginFrom2Nix { + nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-09-14"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "b3d4408e29d924fe130c9397a7c3b3630b3ea671"; - sha256 = "082j57shp24i4rpg8j600picn3wlxsa1br99yfdrankfb2jbcwls"; + rev = "92dc531eea2c9a3ef504a5c8ac0decd1fa59a6a3"; + sha256 = "17lsa94if1j630spn2nia4bjync4ng2nsp0ld215z17fss0gg6fv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; - nvim-dap-go = buildVimPluginFrom2Nix { + nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2023-08-23"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0"; - sha256 = "00dfcskbj25w4wilrpbq6g1l2zrxf1awplsfqp9nhnzs1ivbg9yb"; + rev = "a5cc8dcad43f0732585d4793deb02a25c4afb766"; + sha256 = "00nm95dpbmjnndvh8kapbgmrbfjqg3dd8hhrwgd3rmk30d777zxq"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; - nvim-dap-python = buildVimPluginFrom2Nix { + nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; version = "2023-05-23"; src = fetchFromGitHub { @@ -6934,7 +6946,7 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; - nvim-dap-ui = buildVimPluginFrom2Nix { + nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; version = "2023-09-10"; src = fetchFromGitHub { @@ -6946,7 +6958,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; - nvim-dap-virtual-text = buildVimPluginFrom2Nix { + nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; version = "2023-05-25"; src = fetchFromGitHub { @@ -6958,7 +6970,7 @@ final: prev: meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; - nvim-expand-expr = buildVimPluginFrom2Nix { + nvim-expand-expr = buildVimPlugin { pname = "nvim-expand-expr"; version = "2021-08-14"; src = fetchFromGitHub { @@ -6970,7 +6982,7 @@ final: prev: meta.homepage = "https://github.com/allendang/nvim-expand-expr/"; }; - nvim-fzf = buildVimPluginFrom2Nix { + nvim-fzf = buildVimPlugin { pname = "nvim-fzf"; version = "2023-09-05"; src = fetchFromGitHub { @@ -6982,7 +6994,7 @@ final: prev: meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; - nvim-fzf-commands = buildVimPluginFrom2Nix { + nvim-fzf-commands = buildVimPlugin { pname = "nvim-fzf-commands"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6994,19 +7006,19 @@ final: prev: meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; - nvim-gdb = buildVimPluginFrom2Nix { + nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2023-08-16"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "6fd4eb53ac25fda0c2f1a60457c5f0592a0e95ad"; - sha256 = "0n4q5sls5kwbzkc4z3g26r0d76r9bvy5q8h0kb70xs7n2h289iqh"; + rev = "c0328e23b815bbe55935945332c5e5dc88092792"; + sha256 = "154vry38gq0kv2ya23pgnbby9hizivyamnv0vcag3g27nj7xk2a4"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; - nvim-gps = buildVimPluginFrom2Nix { + nvim-gps = buildVimPlugin { pname = "nvim-gps"; version = "2022-07-05"; src = fetchFromGitHub { @@ -7018,7 +7030,7 @@ final: prev: meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; - nvim-highlight-colors = buildVimPluginFrom2Nix { + nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; version = "2023-07-27"; src = fetchFromGitHub { @@ -7030,19 +7042,19 @@ final: prev: meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; - nvim-highlite = buildVimPluginFrom2Nix { + nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2023-08-29"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b93d2c63ed39f76c4fea9348bb0ad3e261e89695"; - sha256 = "00jgq2qiqp6i8mm1vrp3g4g9kvb42yvfr0d37afg97jwkim0k3g5"; + rev = "5dfa7701c586b7ddba4152e512563c377e031b49"; + sha256 = "1yxcd6xl5zjbsz6x34fnslhpaqs1liyvwqwkk0sdsiyzb6iv7wvw"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; - nvim-hlslens = buildVimPluginFrom2Nix { + nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; version = "2023-08-06"; src = fetchFromGitHub { @@ -7054,7 +7066,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; - nvim-hs-vim = buildVimPluginFrom2Nix { + nvim-hs-vim = buildVimPlugin { pname = "nvim-hs.vim"; version = "2022-01-30"; src = fetchFromGitHub { @@ -7066,19 +7078,19 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-jdtls = buildVimPluginFrom2Nix { + nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-09-14"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "697b39e3db0e0d0ce9ee4c2df506a4e0386af6c2"; - sha256 = "0iaccv986r4z1lmfih24dk2ls501bfqw3n7z4h0mwbf7xqm9jml3"; + rev = "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f"; + sha256 = "1ck1f55y19m049bqwb3j77sq5glwafy48w7b01z324qdj68vhy6n"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; - nvim-jqx = buildVimPluginFrom2Nix { + nvim-jqx = buildVimPlugin { pname = "nvim-jqx"; version = "2023-02-28"; src = fetchFromGitHub { @@ -7090,7 +7102,7 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; - nvim-julia-autotest = buildVimPluginFrom2Nix { + nvim-julia-autotest = buildVimPlugin { pname = "nvim-julia-autotest"; version = "2022-10-31"; src = fetchgit { @@ -7101,7 +7113,7 @@ final: prev: meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; }; - nvim-lastplace = buildVimPluginFrom2Nix { + nvim-lastplace = buildVimPlugin { pname = "nvim-lastplace"; version = "2023-07-27"; src = fetchFromGitHub { @@ -7113,7 +7125,7 @@ final: prev: meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; }; - nvim-lightbulb = buildVimPluginFrom2Nix { + nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; version = "2023-07-20"; src = fetchFromGitHub { @@ -7125,7 +7137,7 @@ final: prev: meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; - nvim-lightline-lsp = buildVimPluginFrom2Nix { + nvim-lightline-lsp = buildVimPlugin { pname = "nvim-lightline-lsp"; version = "2022-05-30"; src = fetchFromGitHub { @@ -7137,31 +7149,31 @@ final: prev: meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; }; - nvim-lilypond-suite = buildVimPluginFrom2Nix { + nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-09-15"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "b734d3f3e91b1cdf7944d10b842e2898188669d6"; - sha256 = "00vbhfglgspbmv1ar5xjdcv8kv3s1y8a6cqalw6va5wazzy2slci"; + rev = "ac99483249bfa202395e3abcfce7bd39288d93e7"; + sha256 = "11l0bbbaxxinm17j9aqw7an1nfd77pgmkmh3acdx5ppnk8d9141z"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; - nvim-lint = buildVimPluginFrom2Nix { + nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-09-14"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "12517fb62b9760053b3edebc0b03308921a30f5c"; - sha256 = "1qsn5ziprl8wz606rjpri18i25hdsc12b39w4xb2nqkxwx3hdi2l"; + rev = "6d596b87862909370f4d1e6535cc9fad80c89fe6"; + sha256 = "17c16fc94lzi04q7r6yfz50cycq6pbih884gkvlgkyyy92b6bcqn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; - nvim-lsp-notify = buildVimPluginFrom2Nix { + nvim-lsp-notify = buildVimPlugin { pname = "nvim-lsp-notify"; version = "2023-03-19"; src = fetchFromGitHub { @@ -7173,7 +7185,7 @@ final: prev: meta.homepage = "https://github.com/mrded/nvim-lsp-notify/"; }; - nvim-lsp-ts-utils = buildVimPluginFrom2Nix { + nvim-lsp-ts-utils = buildVimPlugin { pname = "nvim-lsp-ts-utils"; version = "2022-07-17"; src = fetchFromGitHub { @@ -7185,19 +7197,19 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; - nvim-lspconfig = buildVimPluginFrom2Nix { + nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-09-15"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cc388d3f6b9c7c943ae2b2dcd46ad470fd257f91"; - sha256 = "0xw1xya93qks2azp0rg2k7fyg2ak31c3z897af9d3lx0nrhy31xs"; + rev = "e49b1e90c1781ce372013de3fa93a91ea29fc34a"; + sha256 = "0pb33c3dgv6pvn6avc6zrbfrzr63wd9hxkz5rz6y05w633d61mc8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; - nvim-lsputils = buildVimPluginFrom2Nix { + nvim-lsputils = buildVimPlugin { pname = "nvim-lsputils"; version = "2022-01-29"; src = fetchFromGitHub { @@ -7209,7 +7221,7 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; - nvim-lua-gf = buildVimPluginFrom2Nix { + nvim-lua-gf = buildVimPlugin { pname = "nvim-lua-gf"; version = "2022-07-31"; src = fetchFromGitHub { @@ -7221,7 +7233,7 @@ final: prev: meta.homepage = "https://github.com/sam4llis/nvim-lua-gf/"; }; - nvim-luadev = buildVimPluginFrom2Nix { + nvim-luadev = buildVimPlugin { pname = "nvim-luadev"; version = "2023-03-13"; src = fetchFromGitHub { @@ -7233,7 +7245,7 @@ final: prev: meta.homepage = "https://github.com/bfredl/nvim-luadev/"; }; - nvim-luapad = buildVimPluginFrom2Nix { + nvim-luapad = buildVimPlugin { pname = "nvim-luapad"; version = "2022-12-11"; src = fetchFromGitHub { @@ -7245,19 +7257,19 @@ final: prev: meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; - nvim-metals = buildVimPluginFrom2Nix { + nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-08-17"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "57cff9a240f3337129188997887d8848fe6022ad"; - sha256 = "0ysrq30k3fblgd1hlvywrq1jrkcgdnm3habcaw13b2xfp4hqlps7"; + rev = "7e302107366610ff0170495a130e6d7645b93795"; + sha256 = "0h38mkxdwmnpc2arqqxx7n99q7zj7r6b8ypw7cwk7a1p3vaav98y"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; - nvim-moonwalk = buildVimPluginFrom2Nix { + nvim-moonwalk = buildVimPlugin { pname = "nvim-moonwalk"; version = "2022-04-12"; src = fetchFromGitHub { @@ -7269,7 +7281,7 @@ final: prev: meta.homepage = "https://github.com/gpanders/nvim-moonwalk/"; }; - nvim-navbuddy = buildVimPluginFrom2Nix { + nvim-navbuddy = buildVimPlugin { pname = "nvim-navbuddy"; version = "2023-09-14"; src = fetchFromGitHub { @@ -7281,19 +7293,19 @@ final: prev: meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; - nvim-navic = buildVimPluginFrom2Nix { + nvim-navic = buildVimPlugin { pname = "nvim-navic"; - version = "2023-07-21"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "9c89730da6a05acfeb6a197e212dfadf5aa60ca0"; - sha256 = "1ginwysk4apjx2f045isidnzw863zrv272bdmzh247vi5za57c1k"; + rev = "0ffa7ffe6588f3417e680439872f5049e38a24db"; + sha256 = "04fd7gcs6hhc44pya1k8ds332hm1jpg44w3ri14g3r2850b8b02z"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; - nvim-neoclip-lua = buildVimPluginFrom2Nix { + nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; version = "2023-05-16"; src = fetchFromGitHub { @@ -7305,7 +7317,7 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; - nvim-nonicons = buildVimPluginFrom2Nix { + nvim-nonicons = buildVimPlugin { pname = "nvim-nonicons"; version = "2023-02-04"; src = fetchFromGitHub { @@ -7317,19 +7329,19 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; - nvim-notify = buildVimPluginFrom2Nix { + nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2023-09-10"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "94859430020f5cf32a1b97ddd9e596fed9db7981"; - sha256 = "04fcm8277csv8davwirndinm0cpnb5h8azr2cxnw1szgqry2yh7k"; + rev = "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3"; + sha256 = "1a7s4y8xd1plcidnzs29rhqw7mfbj1q01bqffqjmimii9v6azmfn"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; - nvim-nu = buildVimPluginFrom2Nix { + nvim-nu = buildVimPlugin { pname = "nvim-nu"; version = "2023-03-07"; src = fetchFromGitHub { @@ -7341,19 +7353,19 @@ final: prev: meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; - nvim-osc52 = buildVimPluginFrom2Nix { + nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; - version = "2023-05-15"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "3e96035d62290183fe7a11418db2b254fcfcaee3"; - sha256 = "12zdrwjlrvzlpwqi757llfvr7ir6ww949i85da385n2crj3jfd8i"; + rev = "5689dc08ee1ade3feb7f74bdd6e539fba70f3064"; + sha256 = "0pq68f0rfvvxw3y9kkwhqxrlvyk8gjfn8i8a06pb7m9k91r2qm5s"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; - nvim-peekup = buildVimPluginFrom2Nix { + nvim-peekup = buildVimPlugin { pname = "nvim-peekup"; version = "2023-02-23"; src = fetchFromGitHub { @@ -7365,7 +7377,7 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; - nvim-pqf = buildVimPluginFrom2Nix { + nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; version = "2023-07-24"; src = fetchFromGitHub { @@ -7377,7 +7389,7 @@ final: prev: meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; - nvim-remote-containers = buildVimPluginFrom2Nix { + nvim-remote-containers = buildVimPlugin { pname = "nvim-remote-containers"; version = "2023-08-01"; src = fetchFromGitHub { @@ -7389,7 +7401,7 @@ final: prev: meta.homepage = "https://github.com/jamestthompson3/nvim-remote-containers/"; }; - nvim-rename-state = buildVimPluginFrom2Nix { + nvim-rename-state = buildVimPlugin { pname = "nvim-rename-state"; version = "2023-01-30"; src = fetchFromGitHub { @@ -7401,7 +7413,7 @@ final: prev: meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; - nvim-scrollbar = buildVimPluginFrom2Nix { + nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; version = "2023-05-23"; src = fetchFromGitHub { @@ -7413,19 +7425,19 @@ final: prev: meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; - nvim-scrollview = buildVimPluginFrom2Nix { + nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-09-03"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b0737d036cfbb39e066d144702197eda0a4b6cf1"; - sha256 = "1r89wdsv8g7dmd06a9zx99mb6r45ns5d7sn7rflax2n1wrfraaix"; + rev = "e8befc94ea66194700495d2f71419ba112634b0b"; + sha256 = "0015w0f55xfzbnf0f6pbipdg3k2zbvdcimw34qjbcf86cyllbr90"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; - nvim-search-and-replace = buildVimPluginFrom2Nix { + nvim-search-and-replace = buildVimPlugin { pname = "nvim-search-and-replace"; version = "2022-09-06"; src = fetchFromGitHub { @@ -7437,7 +7449,7 @@ final: prev: meta.homepage = "https://github.com/s1n7ax/nvim-search-and-replace/"; }; - nvim-snippy = buildVimPluginFrom2Nix { + nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; version = "2023-09-09"; src = fetchFromGitHub { @@ -7449,7 +7461,7 @@ final: prev: meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; - nvim-solarized-lua = buildVimPluginFrom2Nix { + nvim-solarized-lua = buildVimPlugin { pname = "nvim-solarized-lua"; version = "2022-11-19"; src = fetchFromGitHub { @@ -7461,31 +7473,31 @@ final: prev: meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; - nvim-spectre = buildVimPluginFrom2Nix { + nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-09-13"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5"; - sha256 = "01j8xxjlj10ayfffhb5fav9r86599zqn17i9jd3kmc59m8yxdpr7"; + rev = "696cff781a4a7ecc91549736835e2acbd00fe859"; + sha256 = "0avm6klg32f9n0y399s51bhm8fmhvirq4dakxl0bbjv06m0lkwvy"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; - nvim-spider = buildVimPluginFrom2Nix { + nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-09-14"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "be7273858d75673a0ae594552742eb8769f35d6a"; - sha256 = "1qr59fq94j1l5qj5xk0v9mnp65gjg2iqwsal9j7c7c6cxz76bg7s"; + rev = "28ea1139b3b566187813684a4d37e3da0ce2b888"; + sha256 = "0c9xlzg37ci7419gx830by8yczkx9x1aszwc5s7vgxwk4qdk72l8"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; - nvim-surround = buildVimPluginFrom2Nix { + nvim-surround = buildVimPlugin { pname = "nvim-surround"; version = "2023-08-18"; src = fetchFromGitHub { @@ -7497,7 +7509,7 @@ final: prev: meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; - nvim-teal-maker = buildVimPluginFrom2Nix { + nvim-teal-maker = buildVimPlugin { pname = "nvim-teal-maker"; version = "2022-04-09"; src = fetchFromGitHub { @@ -7509,7 +7521,7 @@ final: prev: meta.homepage = "https://github.com/svermeulen/nvim-teal-maker/"; }; - nvim-terminal-lua = buildVimPluginFrom2Nix { + nvim-terminal-lua = buildVimPlugin { pname = "nvim-terminal.lua"; version = "2019-10-17"; src = fetchFromGitHub { @@ -7521,7 +7533,7 @@ final: prev: meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; - nvim-test = buildVimPluginFrom2Nix { + nvim-test = buildVimPlugin { pname = "nvim-test"; version = "2023-05-02"; src = fetchFromGitHub { @@ -7533,55 +7545,55 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-test/"; }; - nvim-tree-lua = buildVimPluginFrom2Nix { + nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-09-16"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7f7665a17b60d80533b7a69cfad3b6875f2dd453"; - sha256 = "1cv3zc1d6cvqxf9kpi6dw7xzr9qj3zj6v990x7hfpds38f2ps87l"; + rev = "40b9b887d090d5da89a84689b4ca0304a9649f62"; + sha256 = "018fnw95vlhac7y5ai1wzpd69b3qjxji57yyrg7gw4ccvj97dvqj"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; - nvim-treesitter = buildVimPluginFrom2Nix { + nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-09-16"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "794266a4edc8ab57b0d637626f01b5278a9123d8"; - sha256 = "0h2wa98ljgkr56yfcbif4xyn2721padzfavj3fd89wib3ylk5qzx"; + rev = "9c4fc86b67c1d68141cef57846d24cbee9b74fb0"; + sha256 = "1ydmsvhl01s76qx0a10ipp7fkqazm1p19hspwj7cwlxvls952xfm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; - nvim-treesitter-context = buildVimPluginFrom2Nix { + nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-09-06"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "b6c763db8cc486215ba96e0a67418848a710ab25"; - sha256 = "0zawrncadph3ra9fb48d63g4lg7ng5gkskkxl3hqy71lcngsi51b"; + rev = "82c695951612911421e8e21068ba5fc2c2e2c212"; + sha256 = "1q0s84h15dkadjln27nmxfnviqilfn9y7py8nk7cmgk9djcx933c"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; - nvim-treesitter-endwise = buildVimPluginFrom2Nix { + nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2023-06-28"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "9298b3ac8fd6d0d8f9e321194c6d3fd37e417cf9"; - sha256 = "1zkc892v347380awywfyfk0q8nsavi37zgz9yhizc4am6lphn391"; + rev = "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d"; + sha256 = "0320lz13zymw70wx7malkw4nkma3scz4kz35mq59f9p51dan6iky"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; - nvim-treesitter-pyfold = buildVimPluginFrom2Nix { + nvim-treesitter-pyfold = buildVimPlugin { pname = "nvim-treesitter-pyfold"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7593,7 +7605,7 @@ final: prev: meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; - nvim-treesitter-refactor = buildVimPluginFrom2Nix { + nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; version = "2023-04-04"; src = fetchFromGitHub { @@ -7605,31 +7617,31 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; - nvim-treesitter-textobjects = buildVimPluginFrom2Nix { + nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-08-29"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; - sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; + rev = "78c49ca7d2f7ccba2115c11422c037713c978ad1"; + sha256 = "00z4adcq70j981a2v17xjx1izcqh716cqjp2vf8dsibplxbv4aja"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; - nvim-treesitter-textsubjects = buildVimPluginFrom2Nix { + nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2023-08-03"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "df75fcec548014f158cda6498ac38c4622c221e1"; - sha256 = "0fx8b9w03zn6v8db2w6h29y8hpbjckvm27nh49vvsis3icqyk7iv"; + rev = "48b3bf54e32f23e2299c59ff76fa3b0599565b39"; + sha256 = "11nmxnqr8dnn1l24gcrm4bpvpmy4ibsi6x46iz5y2vp7pzrj6cf9"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; - nvim-ts-autotag = buildVimPluginFrom2Nix { + nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; version = "2023-06-16"; src = fetchFromGitHub { @@ -7641,19 +7653,19 @@ final: prev: meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; - nvim-ts-context-commentstring = buildVimPluginFrom2Nix { + nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-09-14"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "95e9ba9de4289d221666b66fd930d157c7ca08c6"; - sha256 = "0acr7d16h22xk5c2dfv2wmwa9p5g5k06pqghkzym8bv70ag4lr8g"; + rev = "92e688f013c69f90c9bbd596019ec10235bc51de"; + sha256 = "1wfaqq7gfkpf8jf8calin0ycy3hjvylh945bvlacv4zjnq9c3n2m"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; - nvim-ts-rainbow = buildVimPluginFrom2Nix { + nvim-ts-rainbow = buildVimPlugin { pname = "nvim-ts-rainbow"; version = "2023-06-07"; src = fetchFromGitHub { @@ -7665,7 +7677,7 @@ final: prev: meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; - nvim-ts-rainbow2 = buildVimPluginFrom2Nix { + nvim-ts-rainbow2 = buildVimPlugin { pname = "nvim-ts-rainbow2"; version = "2023-07-12"; src = fetchgit { @@ -7676,19 +7688,19 @@ final: prev: meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; - nvim-ufo = buildVimPluginFrom2Nix { + nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-09-13"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "ddec0c27e9cd2d22df4ecacc45e9d6ce567f7c35"; - sha256 = "1jyrhrpp5144nnni1m054h94a99gmlp9c3hhjmg27zm9hwwd01z0"; + rev = "f7eea53e88456403212df074b9aa3148a3908435"; + sha256 = "0vba56iij1hw9jby4zlqvz6msav0sy25pkgfsvb5lkmw8c4hrvi9"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; - nvim-unception = buildVimPluginFrom2Nix { + nvim-unception = buildVimPlugin { pname = "nvim-unception"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7700,19 +7712,19 @@ final: prev: meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; - nvim-web-devicons = buildVimPluginFrom2Nix { + nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-09-15"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "973ab742f143a796a779af4d786ec409116a0d87"; - sha256 = "1fmvym6ryxmff5559s6aw6nv4h5cgz2lnkjnhzbwws4iryvc90zl"; + rev = "3af745113ea537f58c4b1573b64a429fefad9e07"; + sha256 = "103spgpvwm4pv32h954sv68p6qjizkm4fdvyzndjgw9x9bah5ksh"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; - nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { + nvim-whichkey-setup-lua = buildVimPlugin { pname = "nvim-whichkey-setup.lua"; version = "2021-04-16"; src = fetchFromGitHub { @@ -7724,19 +7736,19 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/"; }; - nvim-window-picker = buildVimPluginFrom2Nix { + nvim-window-picker = buildVimPlugin { pname = "nvim-window-picker"; - version = "2023-07-29"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "s1n7ax"; repo = "nvim-window-picker"; - rev = "1b1bb834b0acb9eebb11a61664efc665757f1ba2"; - sha256 = "1ds2x5hnliw8c7zkqvmnij9bycnxgf3q0vnl0bzb7ki3jc2qg1r8"; + rev = "e7b6699fbd007bbe61dc444734b9bade445b2984"; + sha256 = "01l5d0bylgv1kg4wlq3n2rk656fzh0scy68l88nkbra7qqj9d5i2"; }; meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; }; - nvim-yarp = buildVimPluginFrom2Nix { + nvim-yarp = buildVimPlugin { pname = "nvim-yarp"; version = "2022-06-08"; src = fetchFromGitHub { @@ -7748,7 +7760,7 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; - nvim_context_vt = buildVimPluginFrom2Nix { + nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; version = "2023-08-26"; src = fetchFromGitHub { @@ -7760,7 +7772,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; - nvimdev-nvim = buildVimPluginFrom2Nix { + nvimdev-nvim = buildVimPlugin { pname = "nvimdev.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -7772,7 +7784,7 @@ final: prev: meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; - nvterm = buildVimPluginFrom2Nix { + nvterm = buildVimPlugin { pname = "nvterm"; version = "2023-09-09"; src = fetchFromGitHub { @@ -7784,7 +7796,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/nvterm/"; }; - oceanic-material = buildVimPluginFrom2Nix { + oceanic-material = buildVimPlugin { pname = "oceanic-material"; version = "2023-06-22"; src = fetchFromGitHub { @@ -7796,7 +7808,7 @@ final: prev: meta.homepage = "https://github.com/nvimdev/oceanic-material/"; }; - oceanic-next = buildVimPluginFrom2Nix { + oceanic-next = buildVimPlugin { pname = "oceanic-next"; version = "2023-05-01"; src = fetchFromGitHub { @@ -7808,32 +7820,32 @@ final: prev: meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; - octo-nvim = buildVimPluginFrom2Nix { + octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-08-28"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "d1e52f9b3c755fcebb93d635821663a2c0f53281"; - sha256 = "0gvb7g6844w9ll6w7qwh5ian0vz5sr90nyw7x3pybms8w74wvcrn"; + rev = "e933611c74cb735c00d0db8ca94533bec1444bf0"; + sha256 = "06rp3fnh4v7kpssirp6jnas9ch4vf0iap05m78vr0ackdsgs6gxm"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; - oil-nvim = buildVimPluginFrom2Nix { + oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-09-12"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "9e036c6a4868b971127f3cb6bac6197bb4103723"; - sha256 = "1q6r479xfcx1xwrm0b2zzv88qjilbm4pw2nvcsdlczhdwqnsq0al"; + rev = "3275996ce65f142d0e96b9fc2658f94e5bd43ad5"; + sha256 = "08j4f2i4wqkz37nnbf8jmp8lvvz3v3fzgg3ap3pm5paa724bjf0b"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; }; - omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { + omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; version = "2023-04-14"; src = fetchFromGitHub { @@ -7845,7 +7857,7 @@ final: prev: meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; - one-nvim = buildVimPluginFrom2Nix { + one-nvim = buildVimPlugin { pname = "one-nvim"; version = "2021-06-10"; src = fetchFromGitHub { @@ -7857,19 +7869,19 @@ final: prev: meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; - onedark-nvim = buildVimPluginFrom2Nix { + onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-09-04"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "dac8c39812dae025255c9069a260e1f69d967927"; - sha256 = "15cv4cxgxy5llhhdla2hjfvn7544m3dasysd6ci8h5ys8x75nva0"; + rev = "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1"; + sha256 = "0p8fr1hjp7ijyadvk0bf9c7gxh9gcn73hww9q4bqkyrwja3knrqk"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; - onedark-vim = buildVimPluginFrom2Nix { + onedark-vim = buildVimPlugin { pname = "onedark.vim"; version = "2023-07-19"; src = fetchFromGitHub { @@ -7881,19 +7893,19 @@ final: prev: meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; - onedarkpro-nvim = buildVimPluginFrom2Nix { + onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-09-16"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "15c9b5b4ff38b3dcde4370e0a1ce12b927451dd4"; - sha256 = "1y8a7hyd2aghzgf83s3y4yanhzmcxads19hqfbl84cqf3lg4f4k8"; + rev = "7c02b4eeb310173ef6d741e60200d72b76923eae"; + sha256 = "1vmix76dr7sv199nwmvmxxgp7cqysi77m79p4bgsx2mynmkdx4p4"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; - onehalf = buildVimPluginFrom2Nix { + onehalf = buildVimPlugin { pname = "onehalf"; version = "2022-08-02"; src = fetchFromGitHub { @@ -7905,19 +7917,19 @@ final: prev: meta.homepage = "https://github.com/sonph/onehalf/"; }; - onenord-nvim = buildVimPluginFrom2Nix { + onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-09-11"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "5d4ea147564f6a5e5a2aea643c1fae15acb66b90"; - sha256 = "1r3kx8h17dsyda86amx4j8q29dpm8w4rqli7iwldww7bcp3skbg5"; + rev = "4c14ce82e389122bc3443494d784a9016f0abc5d"; + sha256 = "16gyikz3bpwdf0xj43kh374cw5z3haciq3r191kaan2733kwp95d"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; - open-browser-github-vim = buildVimPluginFrom2Nix { + open-browser-github-vim = buildVimPlugin { pname = "open-browser-github.vim"; version = "2021-03-21"; src = fetchFromGitHub { @@ -7929,7 +7941,7 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; - open-browser-vim = buildVimPluginFrom2Nix { + open-browser-vim = buildVimPlugin { pname = "open-browser.vim"; version = "2022-10-08"; src = fetchFromGitHub { @@ -7941,19 +7953,19 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; - openingh-nvim = buildVimPluginFrom2Nix { + openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2023-08-28"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "27655e19d4cad90f2ceed4f0a08cf7ebfb3a8e40"; - sha256 = "0jl5y6pgwdjin7rcrw8p2xv7x6z8gz9wkn7ijx3ixs5278q8wijb"; + rev = "cdca4f17dbc2ed85ea5e54c594eb57c4057d9290"; + sha256 = "04jx2pprk1072a06vanyml6bv4qh0hhfmjz145jjp69rn1pzqm8f"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; - openscad-nvim = buildVimPluginFrom2Nix { + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2023-06-19"; src = fetchFromGitHub { @@ -7965,19 +7977,19 @@ final: prev: meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; - orgmode = buildVimPluginFrom2Nix { + orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-09-15"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "34f977c090da2ff9f8cea01eecae8bd7d83fdef9"; - sha256 = "1dxnd0b7fljfzkfqvbf7snkz1ia8npc4x458pakd641r9ad3ny6z"; + rev = "5ef11419116578a6cbfb0a18674e590237ded080"; + sha256 = "03kqwd6f49sczanfasdg5jb43fyab0vcxy30da82xi149a16kv45"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; - other-nvim = buildVimPluginFrom2Nix { + other-nvim = buildVimPlugin { pname = "other.nvim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -7989,44 +8001,44 @@ final: prev: meta.homepage = "https://github.com/rgroli/other.nvim/"; }; - otter-nvim = buildVimPluginFrom2Nix { + otter-nvim = buildVimPlugin { pname = "otter.nvim"; version = "2023-09-16"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "3501362a98fbbb64d23fe5fbcd2a98307f9229f8"; - sha256 = "0innvpbih3w22mara59nnxcpsg9rnn7xlxgb3db5gy7f3g2am5r5"; + rev = "2752dd199d73342f13a1bd599a99822505e2803f"; + sha256 = "00jmwd8la3cadhy2dzl3gzq8wbgn6xwjb9l35h1w1k161pl5p882"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; - overseer-nvim = buildVimPluginFrom2Nix { + overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-09-14"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "2749d8893a069a0020eba3ddbc26f1624a57d7b3"; - sha256 = "0976kdjsdjdk41zda42hi3wnk0x08iqlmiajs2amzgxdyj4x349r"; + rev = "400e762648b70397d0d315e5acaf0ff3597f2d8b"; + sha256 = "04ixcnnls7jhdxsfm5s33c59vwgz5b8ni0ygvgsf4i3bdv6sxa66"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; }; - oxocarbon-nvim = buildVimPluginFrom2Nix { + oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2023-08-30"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "162a92e2bcca588a01c2f9fd857bdb4dabd8d72c"; - sha256 = "06q6ykda4pbkqblkqvk7l1gjw9hwn06l13v1sann39dzgwi1yrw7"; + rev = "b47c0ecab3a4270815afb3b05e03423b04cca8f2"; + sha256 = "1hkjc7x5ma8pmz5vi93ygqmbdfammikpvjjxkw9axlh5wh8ys48y"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; - package-info-nvim = buildVimPluginFrom2Nix { + package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; version = "2023-03-28"; src = fetchFromGitHub { @@ -8038,7 +8050,7 @@ final: prev: meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; - packer-nvim = buildVimPluginFrom2Nix { + packer-nvim = buildVimPlugin { pname = "packer.nvim"; version = "2023-08-24"; src = fetchFromGitHub { @@ -8050,7 +8062,7 @@ final: prev: meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; - palenight-vim = buildVimPluginFrom2Nix { + palenight-vim = buildVimPlugin { pname = "palenight.vim"; version = "2023-04-27"; src = fetchFromGitHub { @@ -8062,7 +8074,7 @@ final: prev: meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; - papercolor-theme = buildVimPluginFrom2Nix { + papercolor-theme = buildVimPlugin { pname = "papercolor-theme"; version = "2022-06-08"; src = fetchFromGitHub { @@ -8074,7 +8086,7 @@ final: prev: meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; - pear-tree = buildVimPluginFrom2Nix { + pear-tree = buildVimPlugin { pname = "pear-tree"; version = "2019-12-08"; src = fetchFromGitHub { @@ -8086,7 +8098,7 @@ final: prev: meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; - pears-nvim = buildVimPluginFrom2Nix { + pears-nvim = buildVimPlugin { pname = "pears.nvim"; version = "2021-05-27"; src = fetchFromGitHub { @@ -8098,19 +8110,19 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; - persistence-nvim = buildVimPluginFrom2Nix { + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2023-05-22"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "4b8051c01f696d8849a5cb8afa9767be8db16e40"; - sha256 = "1nzsv0rvv1jn6lqjbjrd7zcfnn74ckhng5aya3wb1q1qrnd557v6"; + rev = "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32"; + sha256 = "0817bx2x7pshxxvdp3njq1q19xv84lxga2vdanx9zijfs8pid2y0"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; - peskcolor-vim = buildVimPluginFrom2Nix { + peskcolor-vim = buildVimPlugin { pname = "peskcolor.vim"; version = "2016-06-11"; src = fetchFromGitHub { @@ -8122,7 +8134,7 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; - pest-vim = buildVimPluginFrom2Nix { + pest-vim = buildVimPlugin { pname = "pest.vim"; version = "2023-06-16"; src = fetchFromGitHub { @@ -8134,7 +8146,7 @@ final: prev: meta.homepage = "https://github.com/pest-parser/pest.vim/"; }; - pgsql-vim = buildVimPluginFrom2Nix { + pgsql-vim = buildVimPlugin { pname = "pgsql.vim"; version = "2021-12-08"; src = fetchFromGitHub { @@ -8146,7 +8158,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/pgsql.vim/"; }; - pig-vim = buildVimPluginFrom2Nix { + pig-vim = buildVimPlugin { pname = "pig.vim"; version = "2017-06-08"; src = fetchFromGitHub { @@ -8158,7 +8170,7 @@ final: prev: meta.homepage = "https://github.com/motus/pig.vim/"; }; - plantuml-previewer-vim = buildVimPluginFrom2Nix { + plantuml-previewer-vim = buildVimPlugin { pname = "plantuml-previewer.vim"; version = "2023-03-07"; src = fetchFromGitHub { @@ -8170,7 +8182,7 @@ final: prev: meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/"; }; - plantuml-syntax = buildVimPluginFrom2Nix { + plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; version = "2022-08-26"; src = fetchFromGitHub { @@ -8182,7 +8194,7 @@ final: prev: meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; - playground = buildVimPluginFrom2Nix { + playground = buildVimPlugin { pname = "playground"; version = "2023-09-15"; src = fetchFromGitHub { @@ -8196,17 +8208,17 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-09-12"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9ce85b0f7dcfe5358c0be937ad23e456907d410b"; - sha256 = "0772bqmfkx27b6kfn8x28v8ll0qr2zvdclynansraprrzllsqymk"; + rev = "50012918b2fc8357b87cff2a7f7f0446e47da174"; + sha256 = "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; - poimandres-nvim = buildVimPluginFrom2Nix { + poimandres-nvim = buildVimPlugin { pname = "poimandres.nvim"; version = "2023-08-16"; src = fetchFromGitHub { @@ -8218,7 +8230,7 @@ final: prev: meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; - pony-vim-syntax = buildVimPluginFrom2Nix { + pony-vim-syntax = buildVimPlugin { pname = "pony-vim-syntax"; version = "2017-09-26"; src = fetchFromGitHub { @@ -8230,7 +8242,7 @@ final: prev: meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/"; }; - popfix = buildVimPluginFrom2Nix { + popfix = buildVimPlugin { pname = "popfix"; version = "2022-07-04"; src = fetchFromGitHub { @@ -8243,7 +8255,7 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/popfix/"; }; - popup-nvim = buildVimPluginFrom2Nix { + popup-nvim = buildVimPlugin { pname = "popup.nvim"; version = "2021-11-18"; src = fetchFromGitHub { @@ -8255,7 +8267,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; - presence-nvim = buildVimPluginFrom2Nix { + presence-nvim = buildVimPlugin { pname = "presence.nvim"; version = "2023-01-29"; src = fetchFromGitHub { @@ -8267,7 +8279,7 @@ final: prev: meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; - presenting-vim = buildVimPluginFrom2Nix { + presenting-vim = buildVimPlugin { pname = "presenting.vim"; version = "2022-03-27"; src = fetchFromGitHub { @@ -8279,7 +8291,7 @@ final: prev: meta.homepage = "https://github.com/sotte/presenting.vim/"; }; - preto = buildVimPluginFrom2Nix { + preto = buildVimPlugin { pname = "preto"; version = "2023-02-10"; src = fetchFromGitHub { @@ -8291,7 +8303,7 @@ final: prev: meta.homepage = "https://github.com/ewilazarus/preto/"; }; - pretty-fold-nvim = buildVimPluginFrom2Nix { + pretty-fold-nvim = buildVimPlugin { pname = "pretty-fold.nvim"; version = "2022-07-20"; src = fetchFromGitHub { @@ -8303,7 +8315,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/pretty-fold.nvim/"; }; - prev_indent = buildVimPluginFrom2Nix { + prev_indent = buildVimPlugin { pname = "prev_indent"; version = "2014-03-08"; src = fetchFromGitHub { @@ -8315,7 +8327,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/prev_indent/"; }; - project-nvim = buildVimPluginFrom2Nix { + project-nvim = buildVimPlugin { pname = "project.nvim"; version = "2023-04-04"; src = fetchFromGitHub { @@ -8327,7 +8339,7 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; - promise-async = buildVimPluginFrom2Nix { + promise-async = buildVimPlugin { pname = "promise-async"; version = "2023-04-09"; src = fetchFromGitHub { @@ -8339,7 +8351,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; - psc-ide-vim = buildVimPluginFrom2Nix { + psc-ide-vim = buildVimPlugin { pname = "psc-ide-vim"; version = "2021-05-31"; src = fetchFromGitHub { @@ -8351,7 +8363,7 @@ final: prev: meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; - purescript-vim = buildVimPluginFrom2Nix { + purescript-vim = buildVimPlugin { pname = "purescript-vim"; version = "2023-02-06"; src = fetchFromGitHub { @@ -8363,20 +8375,20 @@ final: prev: meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; - python-mode = buildVimPluginFrom2Nix { + python-mode = buildVimPlugin { pname = "python-mode"; - version = "2023-07-03"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "57384b9f278ed1c2b402fe48aad05781882561f1"; - sha256 = "1y30inljvpjrq1yphfjv1x2f0m5bn6gbqg69f3b51fs53sqaswi8"; + rev = "e01c27e8c17b3af2b9df7f6fc5a8a44afc3ad020"; + sha256 = "0g2gcxax1h44rzyv0wfsz78w62cak9riynqh190gncqhzjzswdfp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; }; - python-syntax = buildVimPluginFrom2Nix { + python-syntax = buildVimPlugin { pname = "python-syntax"; version = "2020-12-14"; src = fetchFromGitHub { @@ -8388,7 +8400,7 @@ final: prev: meta.homepage = "https://github.com/vim-python/python-syntax/"; }; - pywal-nvim = buildVimPluginFrom2Nix { + pywal-nvim = buildVimPlugin { pname = "pywal.nvim"; version = "2022-11-03"; src = fetchFromGitHub { @@ -8400,19 +8412,19 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; - quarto-nvim = buildVimPluginFrom2Nix { + quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-09-08"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "b349b7e54f5f5543b6104bfbad0e7d09d4f7c564"; - sha256 = "11q0x50ppyrna7bd7x9id3fpxz7rdj6zii3ysnkh7hfzm3hsg7pi"; + rev = "9b5abed75493aac46dd2c423f72bdfcda9e521b2"; + sha256 = "12p3malaqpl2r9151s59sn0i975didkjrvfdcnk5jg16vng85dsf"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; - quick-scope = buildVimPluginFrom2Nix { + quick-scope = buildVimPlugin { pname = "quick-scope"; version = "2023-08-08"; src = fetchFromGitHub { @@ -8424,7 +8436,7 @@ final: prev: meta.homepage = "https://github.com/unblevable/quick-scope/"; }; - quickfix-reflector-vim = buildVimPluginFrom2Nix { + quickfix-reflector-vim = buildVimPlugin { pname = "quickfix-reflector.vim"; version = "2022-02-02"; src = fetchFromGitHub { @@ -8436,7 +8448,7 @@ final: prev: meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; - quickfixstatus = buildVimPluginFrom2Nix { + quickfixstatus = buildVimPlugin { pname = "quickfixstatus"; version = "2011-09-03"; src = fetchFromGitHub { @@ -8448,7 +8460,7 @@ final: prev: meta.homepage = "https://github.com/dannyob/quickfixstatus/"; }; - quickmath-nvim = buildVimPluginFrom2Nix { + quickmath-nvim = buildVimPlugin { pname = "quickmath.nvim"; version = "2023-03-12"; src = fetchFromGitHub { @@ -8460,7 +8472,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/quickmath.nvim/"; }; - rainbow = buildVimPluginFrom2Nix { + rainbow = buildVimPlugin { pname = "rainbow"; version = "2022-10-08"; src = fetchFromGitHub { @@ -8472,18 +8484,18 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; - rainbow-delimiters-nvim = buildVimPluginFrom2Nix { + rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-08-26"; + version = "2023-10-15"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "9cbd3dc409af1f5531778ccd1ea6bce668241f39"; - sha256 = "0qz4my1xw1vww2109s8icscwfysa2aak3kjq2wym2smm259gd8g1"; + rev = "f1ce55edcbd2c25a544c93357c66d4172a870766"; + sha256 = "0lfnpkf4cah217p1dp8306yy550h2xj0ll1zq0g4nbq4pw2yg149"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; - rainbow_parentheses-vim = buildVimPluginFrom2Nix { + rainbow_parentheses-vim = buildVimPlugin { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; src = fetchFromGitHub { @@ -8495,7 +8507,7 @@ final: prev: meta.homepage = "https://github.com/kien/rainbow_parentheses.vim/"; }; - random-vim = buildVimPluginFrom2Nix { + random-vim = buildVimPlugin { pname = "random.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -8507,7 +8519,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/random.vim/"; }; - range-highlight-nvim = buildVimPluginFrom2Nix { + range-highlight-nvim = buildVimPlugin { pname = "range-highlight.nvim"; version = "2021-08-03"; src = fetchFromGitHub { @@ -8519,7 +8531,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; }; - ranger-vim = buildVimPluginFrom2Nix { + ranger-vim = buildVimPlugin { pname = "ranger.vim"; version = "2021-12-13"; src = fetchFromGitHub { @@ -8531,7 +8543,7 @@ final: prev: meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; - rcshell-vim = buildVimPluginFrom2Nix { + rcshell-vim = buildVimPlugin { pname = "rcshell.vim"; version = "2014-12-29"; src = fetchFromGitHub { @@ -8543,7 +8555,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/rcshell.vim/"; }; - readline-vim = buildVimPluginFrom2Nix { + readline-vim = buildVimPlugin { pname = "readline.vim"; version = "2023-03-09"; src = fetchFromGitHub { @@ -8555,31 +8567,31 @@ final: prev: meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; - refactoring-nvim = buildVimPluginFrom2Nix { + refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2023-08-31"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554"; - sha256 = "038cczxj9ba3axb3aw5r2dsp5anzacnwnnp61i1pk7kk8l3wg2ck"; + rev = "bebfcfcc4b604d3647fcce2f4aeb02a95d139c49"; + sha256 = "16q4fk034yljv68s8jb74y863n6jzfh78c99ya0918iqyzypmw8i"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; - registers-nvim = buildVimPluginFrom2Nix { + registers-nvim = buildVimPlugin { pname = "registers.nvim"; - version = "2023-09-05"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "f7f7b8a55de10293e2af6002d4da98cbeffc6333"; - sha256 = "12khn5113sijszgmihcblczg4afk34n6wwf0pf3sjj5286ypv2a9"; + rev = "7a16c6e6fe96f3c9c8bb55b95047d745dd34ca4d"; + sha256 = "0ig2xy0c89n3yl3lbff6sdvqggppjwxiv2pbbi0hy8cckn55mfjz"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; - remember-nvim = buildVimPluginFrom2Nix { + remember-nvim = buildVimPlugin { pname = "remember.nvim"; version = "2023-06-12"; src = fetchFromGitHub { @@ -8591,7 +8603,7 @@ final: prev: meta.homepage = "https://github.com/vladdoster/remember.nvim/"; }; - renamer-nvim = buildVimPluginFrom2Nix { + renamer-nvim = buildVimPlugin { pname = "renamer.nvim"; version = "2022-08-29"; src = fetchFromGitHub { @@ -8603,7 +8615,7 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; - replacer-nvim = buildVimPluginFrom2Nix { + replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; src = fetchFromGitHub { @@ -8617,17 +8629,17 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-09-15"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "f13ae54ae2545d4d612593d4a442cbb33a1b5b65"; - sha256 = "0xiyg3yghjvvfzg2qa3gi28n9bm86083sghsv68wc7848s8s5ka4"; + rev = "5bcaa1012ea8efd6093c69d2a4c67fbde760d043"; + sha256 = "1bdn9qc7cxp8ah90hqab8wc8sz676xkr62kvqaw2lcfh9k5ni0f5"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; - riv-vim = buildVimPluginFrom2Nix { + riv-vim = buildVimPlugin { pname = "riv.vim"; version = "2021-08-09"; src = fetchFromGitHub { @@ -8639,7 +8651,7 @@ final: prev: meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; - rnvimr = buildVimPluginFrom2Nix { + rnvimr = buildVimPlugin { pname = "rnvimr"; version = "2023-08-06"; src = fetchFromGitHub { @@ -8651,7 +8663,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; - robotframework-vim = buildVimPluginFrom2Nix { + robotframework-vim = buildVimPlugin { pname = "robotframework-vim"; version = "2017-04-14"; src = fetchFromGitHub { @@ -8663,7 +8675,7 @@ final: prev: meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; - ron-vim = buildVimPluginFrom2Nix { + ron-vim = buildVimPlugin { pname = "ron.vim"; version = "2022-08-19"; src = fetchFromGitHub { @@ -8675,7 +8687,7 @@ final: prev: meta.homepage = "https://github.com/ron-rs/ron.vim/"; }; - rspec-vim = buildVimPluginFrom2Nix { + rspec-vim = buildVimPlugin { pname = "rspec.vim"; version = "2020-08-20"; src = fetchFromGitHub { @@ -8687,7 +8699,7 @@ final: prev: meta.homepage = "https://github.com/keith/rspec.vim/"; }; - rtorrent-syntax-file = buildVimPluginFrom2Nix { + rtorrent-syntax-file = buildVimPlugin { pname = "rtorrent-syntax-file"; version = "2016-03-19"; src = fetchFromGitHub { @@ -8699,7 +8711,7 @@ final: prev: meta.homepage = "https://github.com/ccarpita/rtorrent-syntax-file/"; }; - rust-tools-nvim = buildVimPluginFrom2Nix { + rust-tools-nvim = buildVimPlugin { pname = "rust-tools.nvim"; version = "2023-07-10"; src = fetchFromGitHub { @@ -8711,7 +8723,7 @@ final: prev: meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; - rust-vim = buildVimPluginFrom2Nix { + rust-vim = buildVimPlugin { pname = "rust.vim"; version = "2022-11-27"; src = fetchFromGitHub { @@ -8723,7 +8735,7 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - sad-vim = buildVimPluginFrom2Nix { + sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; src = fetchFromGitHub { @@ -8735,7 +8747,7 @@ final: prev: meta.homepage = "https://github.com/hauleth/sad.vim/"; }; - salt-vim = buildVimPluginFrom2Nix { + salt-vim = buildVimPlugin { pname = "salt-vim"; version = "2017-07-01"; src = fetchFromGitHub { @@ -8747,19 +8759,19 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; - satellite-nvim = buildVimPluginFrom2Nix { + satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2023-07-31"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "542e856b3a727ce4757250cc00e45332fe146690"; - sha256 = "1sjdgf3q60c80zhd4zqiixkizyy3xxa91v60nkag32lnjqmqx9qv"; + rev = "7911fa8137c77258ba509ba875ea52c6d59737e8"; + sha256 = "1gw2l4m38p3iw0wjcjwiq4cq824hblvqir7jiz5dbhfyc74bbr4k"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; - scnvim = buildVimPluginFrom2Nix { + scnvim = buildVimPlugin { pname = "scnvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -8771,7 +8783,7 @@ final: prev: meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; - scope-nvim = buildVimPluginFrom2Nix { + scope-nvim = buildVimPlugin { pname = "scope.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -8783,7 +8795,7 @@ final: prev: meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; - scrollbar-nvim = buildVimPluginFrom2Nix { + scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; version = "2022-06-16"; src = fetchFromGitHub { @@ -8795,7 +8807,7 @@ final: prev: meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; - scss-syntax-vim = buildVimPluginFrom2Nix { + scss-syntax-vim = buildVimPlugin { pname = "scss-syntax.vim"; version = "2019-06-30"; src = fetchFromGitHub { @@ -8807,7 +8819,7 @@ final: prev: meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; }; - searchbox-nvim = buildVimPluginFrom2Nix { + searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; version = "2022-10-31"; src = fetchFromGitHub { @@ -8819,7 +8831,7 @@ final: prev: meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; - securemodelines = buildVimPluginFrom2Nix { + securemodelines = buildVimPlugin { pname = "securemodelines"; version = "2019-02-09"; src = fetchFromGitHub { @@ -8831,7 +8843,7 @@ final: prev: meta.homepage = "https://github.com/RobertAudi/securemodelines/"; }; - self = buildVimPluginFrom2Nix { + self = buildVimPlugin { pname = "self"; version = "2014-05-28"; src = fetchFromGitHub { @@ -8843,7 +8855,7 @@ final: prev: meta.homepage = "https://github.com/megaannum/self/"; }; - semantic-highlight-vim = buildVimPluginFrom2Nix { + semantic-highlight-vim = buildVimPlugin { pname = "semantic-highlight.vim"; version = "2020-09-11"; src = fetchFromGitHub { @@ -8855,7 +8867,7 @@ final: prev: meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; }; - semshi = buildVimPluginFrom2Nix { + semshi = buildVimPlugin { pname = "semshi"; version = "2021-07-24"; src = fetchFromGitHub { @@ -8867,7 +8879,7 @@ final: prev: meta.homepage = "https://github.com/numirias/semshi/"; }; - seoul256-vim = buildVimPluginFrom2Nix { + seoul256-vim = buildVimPlugin { pname = "seoul256.vim"; version = "2023-05-03"; src = fetchFromGitHub { @@ -8879,19 +8891,19 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; - sg-nvim = buildVimPluginFrom2Nix { + sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-09-12"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "a6a677225bffd66bc98e03ed77438cde93a6fd31"; - sha256 = "1410d2z73xnkcyfx3cq4p30qlbg6177alw9anpn7akvhhgr0dlz2"; + rev = "6185fcb842082b6871e1ee48b1c6444c1efdc681"; + sha256 = "0ifmzlg97i2jlajhyvi76a6m5zzlqg4zkr13sd829mf079yhxdjj"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; - shabadou-vim = buildVimPluginFrom2Nix { + shabadou-vim = buildVimPlugin { pname = "shabadou.vim"; version = "2016-07-19"; src = fetchFromGitHub { @@ -8903,7 +8915,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; - sideways-vim = buildVimPluginFrom2Nix { + sideways-vim = buildVimPlugin { pname = "sideways.vim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -8916,7 +8928,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; - skim-vim = buildVimPluginFrom2Nix { + skim-vim = buildVimPlugin { pname = "skim.vim"; version = "2023-05-25"; src = fetchFromGitHub { @@ -8928,7 +8940,7 @@ final: prev: meta.homepage = "https://github.com/lotabout/skim.vim/"; }; - sky-color-clock-vim = buildVimPluginFrom2Nix { + sky-color-clock-vim = buildVimPlugin { pname = "sky-color-clock.vim"; version = "2018-11-03"; src = fetchFromGitHub { @@ -8940,7 +8952,7 @@ final: prev: meta.homepage = "https://github.com/mopp/sky-color-clock.vim/"; }; - slimv = buildVimPluginFrom2Nix { + slimv = buildVimPlugin { pname = "slimv"; version = "2023-07-01"; src = fetchFromGitHub { @@ -8952,19 +8964,19 @@ final: prev: meta.homepage = "https://github.com/kovisoft/slimv/"; }; - smart-splits-nvim = buildVimPluginFrom2Nix { + smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2023-09-12"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "0beb14427dcf2a5d5d63e0064b45032a7bd3e763"; - sha256 = "1jzai9sbq1jhs27gf67ppp4czj21rc18q9dlyb9whjrkiz61dv64"; + rev = "dbf2c13bad1b75ab207639ba817a7e8a8a450042"; + sha256 = "0328ay5c6hr8a9nx2xdhby9n39cizak8a8k2j0szvm3w11cx9jl0"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; - smartcolumn-nvim = buildVimPluginFrom2Nix { + smartcolumn-nvim = buildVimPlugin { pname = "smartcolumn.nvim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -8976,7 +8988,7 @@ final: prev: meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; }; - smartpairs-vim = buildVimPluginFrom2Nix { + smartpairs-vim = buildVimPlugin { pname = "smartpairs.vim"; version = "2018-01-01"; src = fetchFromGitHub { @@ -8988,7 +9000,7 @@ final: prev: meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; - smartyank-nvim = buildVimPluginFrom2Nix { + smartyank-nvim = buildVimPlugin { pname = "smartyank.nvim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -9000,7 +9012,7 @@ final: prev: meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; }; - snap = buildVimPluginFrom2Nix { + snap = buildVimPlugin { pname = "snap"; version = "2022-08-03"; src = fetchFromGitHub { @@ -9012,7 +9024,7 @@ final: prev: meta.homepage = "https://github.com/camspiers/snap/"; }; - snippets-nvim = buildVimPluginFrom2Nix { + snippets-nvim = buildVimPlugin { pname = "snippets.nvim"; version = "2020-09-09"; src = fetchFromGitHub { @@ -9024,7 +9036,7 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; - solarized-nvim = buildVimPluginFrom2Nix { + solarized-nvim = buildVimPlugin { pname = "solarized.nvim"; version = "2023-02-09"; src = fetchFromGitHub { @@ -9036,7 +9048,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; - sonokai = buildVimPluginFrom2Nix { + sonokai = buildVimPlugin { pname = "sonokai"; version = "2023-08-07"; src = fetchFromGitHub { @@ -9048,7 +9060,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/sonokai/"; }; - sort-nvim = buildVimPluginFrom2Nix { + sort-nvim = buildVimPlugin { pname = "sort.nvim"; version = "2023-04-12"; src = fetchFromGitHub { @@ -9060,7 +9072,7 @@ final: prev: meta.homepage = "https://github.com/sQVe/sort.nvim/"; }; - sourcemap-vim = buildVimPluginFrom2Nix { + sourcemap-vim = buildVimPlugin { pname = "sourcemap.vim"; version = "2012-09-19"; src = fetchFromGitHub { @@ -9072,7 +9084,7 @@ final: prev: meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; - space-vim = buildVimPluginFrom2Nix { + space-vim = buildVimPlugin { pname = "space-vim"; version = "2023-04-17"; src = fetchFromGitHub { @@ -9084,7 +9096,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; - spacevim = buildVimPluginFrom2Nix { + spacevim = buildVimPlugin { pname = "spacevim"; version = "2018-03-29"; src = fetchFromGitHub { @@ -9096,7 +9108,7 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; - sparkup = buildVimPluginFrom2Nix { + sparkup = buildVimPlugin { pname = "sparkup"; version = "2012-06-11"; src = fetchFromGitHub { @@ -9108,7 +9120,7 @@ final: prev: meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; - specs-nvim = buildVimPluginFrom2Nix { + specs-nvim = buildVimPlugin { pname = "specs.nvim"; version = "2022-09-20"; src = fetchFromGitHub { @@ -9120,7 +9132,7 @@ final: prev: meta.homepage = "https://github.com/edluffy/specs.nvim/"; }; - spellsitter-nvim = buildVimPluginFrom2Nix { + spellsitter-nvim = buildVimPlugin { pname = "spellsitter.nvim"; version = "2022-09-06"; src = fetchFromGitHub { @@ -9132,7 +9144,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; }; - sphinx-nvim = buildVimPluginFrom2Nix { + sphinx-nvim = buildVimPlugin { pname = "sphinx.nvim"; version = "2023-08-25"; src = fetchFromGitHub { @@ -9144,7 +9156,7 @@ final: prev: meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; - splice-vim = buildVimPluginFrom2Nix { + splice-vim = buildVimPlugin { pname = "splice.vim"; version = "2020-01-15"; src = fetchFromGitHub { @@ -9156,7 +9168,7 @@ final: prev: meta.homepage = "https://github.com/sjl/splice.vim/"; }; - split-term-vim = buildVimPluginFrom2Nix { + split-term-vim = buildVimPlugin { pname = "split-term.vim"; version = "2018-09-30"; src = fetchFromGitHub { @@ -9168,7 +9180,7 @@ final: prev: meta.homepage = "https://github.com/vimlab/split-term.vim/"; }; - splitjoin-vim = buildVimPluginFrom2Nix { + splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; version = "2023-09-02"; src = fetchFromGitHub { @@ -9181,7 +9193,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; - sqlite-lua = buildVimPluginFrom2Nix { + sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; version = "2023-04-19"; src = fetchFromGitHub { @@ -9193,19 +9205,19 @@ final: prev: meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; - srcery-vim = buildVimPluginFrom2Nix { + srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-09-04"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "755e4ab8a63ec2b4ea756a2fa128d642771369e5"; - sha256 = "0f7bhdhpa79f457rhnmg64vl6nnzxmrkl47n30q31y9rvz9v9bp6"; + rev = "8ea4c4f5caf61ac4ab887fc53eabc916985db881"; + sha256 = "0z6i35gcf4qcy9cgsrg2bg2alh0sk6zxqvid8lgkmds4qgrvhxp3"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; - sslsecure-vim = buildVimPluginFrom2Nix { + sslsecure-vim = buildVimPlugin { pname = "sslsecure.vim"; version = "2017-07-27"; src = fetchFromGitHub { @@ -9217,19 +9229,19 @@ final: prev: meta.homepage = "https://github.com/chr4/sslsecure.vim/"; }; - ssr-nvim = buildVimPluginFrom2Nix { + ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-08-20"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4"; - sha256 = "1zkpzf82ln9ymwrrm3zyy763idmm3bqg6vswbgh2sac8xsdfnj56"; + rev = "10d51ddaaba0cd03ccf9ae51620d6e8cad27f1e4"; + sha256 = "01g0jzlzxys67f0nvyscy7r03cvfpsx70qjxbzlbfmjakcvi3q7p"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; - stabilize-nvim = buildVimPluginFrom2Nix { + stabilize-nvim = buildVimPlugin { pname = "stabilize.nvim"; version = "2023-04-14"; src = fetchFromGitHub { @@ -9241,7 +9253,7 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; - stan-vim = buildVimPluginFrom2Nix { + stan-vim = buildVimPlugin { pname = "stan-vim"; version = "2021-05-28"; src = fetchFromGitHub { @@ -9253,7 +9265,7 @@ final: prev: meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; - starrynight = buildVimPluginFrom2Nix { + starrynight = buildVimPlugin { pname = "starrynight"; version = "2021-09-09"; src = fetchFromGitHub { @@ -9265,7 +9277,7 @@ final: prev: meta.homepage = "https://github.com/josegamez82/starrynight/"; }; - starsearch-vim = buildVimPluginFrom2Nix { + starsearch-vim = buildVimPlugin { pname = "starsearch.vim"; version = "2014-09-21"; src = fetchFromGitHub { @@ -9277,19 +9289,19 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; - statuscol-nvim = buildVimPluginFrom2Nix { + statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2023-08-27"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "0944234914438695050eec6f83b4669864680c1a"; - sha256 = "0ia4s68xwjsr9zrn8h48d5bhpcj3qqvcdwak6pwjvg4hxrq7183p"; + rev = "98d02fc90ebd7c4674ec935074d1d09443d49318"; + sha256 = "0ml58i3xfn0nnqci2wh4nqi4y8ydfxbk7px4abkjlym24apbga6y"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; - stylish-nvim = buildVimPluginFrom2Nix { + stylish-nvim = buildVimPlugin { pname = "stylish.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -9301,19 +9313,19 @@ final: prev: meta.homepage = "https://github.com/teto/stylish.nvim/"; }; - substitute-nvim = buildVimPluginFrom2Nix { + substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; - version = "2023-07-20"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "89dbe55cccee36bcb5e2be8c2d92ff8716601734"; - sha256 = "01cwgkgf8kgi4x4flwwfaj4qgafvnzaiixn68im4279rm6m1ic6y"; + rev = "cf35db50188f3d7de624ae391c9bb9f2e9de5610"; + sha256 = "0v1svihxdh74ip1hmbc2aj95znlgvgb8z7ifxyz5sb1bk774460h"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; - substrata-nvim = buildVimPluginFrom2Nix { + substrata-nvim = buildVimPlugin { pname = "substrata.nvim"; version = "2022-10-07"; src = fetchFromGitHub { @@ -9325,7 +9337,7 @@ final: prev: meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; - suda-vim = buildVimPluginFrom2Nix { + suda-vim = buildVimPlugin { pname = "suda.vim"; version = "2023-06-27"; src = fetchFromGitHub { @@ -9337,7 +9349,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; - supertab = buildVimPluginFrom2Nix { + supertab = buildVimPlugin { pname = "supertab"; version = "2021-04-30"; src = fetchFromGitHub { @@ -9349,7 +9361,7 @@ final: prev: meta.homepage = "https://github.com/ervandew/supertab/"; }; - surround-nvim = buildVimPluginFrom2Nix { + surround-nvim = buildVimPlugin { pname = "surround.nvim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -9361,7 +9373,7 @@ final: prev: meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; - sved = buildVimPluginFrom2Nix { + sved = buildVimPlugin { pname = "sved"; version = "2022-08-11"; src = fetchFromGitHub { @@ -9373,7 +9385,7 @@ final: prev: meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; - swayconfig-vim = buildVimPluginFrom2Nix { + swayconfig-vim = buildVimPlugin { pname = "swayconfig.vim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -9385,7 +9397,7 @@ final: prev: meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; - swift-vim = buildVimPluginFrom2Nix { + swift-vim = buildVimPlugin { pname = "swift.vim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -9397,7 +9409,7 @@ final: prev: meta.homepage = "https://github.com/keith/swift.vim/"; }; - switch-vim = buildVimPluginFrom2Nix { + switch-vim = buildVimPlugin { pname = "switch.vim"; version = "2023-08-22"; src = fetchFromGitHub { @@ -9410,7 +9422,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; }; - symbols-outline-nvim = buildVimPluginFrom2Nix { + symbols-outline-nvim = buildVimPlugin { pname = "symbols-outline.nvim"; version = "2023-01-25"; src = fetchFromGitHub { @@ -9422,7 +9434,7 @@ final: prev: meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; - syntastic = buildVimPluginFrom2Nix { + syntastic = buildVimPlugin { pname = "syntastic"; version = "2022-07-10"; src = fetchFromGitHub { @@ -9434,19 +9446,19 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; - tabby-nvim = buildVimPluginFrom2Nix { + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2023-08-30"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "e0a20dc4c0e16ca755184c34a27391f31a91e463"; - sha256 = "16bh1wbdvp2zlk2aq5b7xplirqlqg4mwldspapsmahjjh3mdzg8m"; + rev = "9e537762cbb7647357eab22c61c7c5dda00138dd"; + sha256 = "0wznkhpd3wax8jqw6wa2802x649jv8ph89plz1qwc08ia47lwcfb"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; - tabline-nvim = buildVimPluginFrom2Nix { + tabline-nvim = buildVimPlugin { pname = "tabline.nvim"; version = "2023-07-24"; src = fetchFromGitHub { @@ -9458,7 +9470,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; - tabmerge = buildVimPluginFrom2Nix { + tabmerge = buildVimPlugin { pname = "tabmerge"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9470,7 +9482,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/tabmerge/"; }; - tabnine-vim = buildVimPluginFrom2Nix { + tabnine-vim = buildVimPlugin { pname = "tabnine-vim"; version = "2023-01-01"; src = fetchFromGitHub { @@ -9483,7 +9495,7 @@ final: prev: meta.homepage = "https://github.com/codota/tabnine-vim/"; }; - taboo-vim = buildVimPluginFrom2Nix { + taboo-vim = buildVimPlugin { pname = "taboo.vim"; version = "2019-08-27"; src = fetchFromGitHub { @@ -9495,7 +9507,7 @@ final: prev: meta.homepage = "https://github.com/gcmt/taboo.vim/"; }; - tabout-nvim = buildVimPluginFrom2Nix { + tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; version = "2023-03-29"; src = fetchFromGitHub { @@ -9507,7 +9519,7 @@ final: prev: meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; - tabpagebuffer-vim = buildVimPluginFrom2Nix { + tabpagebuffer-vim = buildVimPlugin { pname = "tabpagebuffer.vim"; version = "2014-09-30"; src = fetchFromGitHub { @@ -9519,7 +9531,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/tabpagebuffer.vim/"; }; - tabular = buildVimPluginFrom2Nix { + tabular = buildVimPlugin { pname = "tabular"; version = "2019-02-19"; src = fetchFromGitHub { @@ -9531,7 +9543,7 @@ final: prev: meta.homepage = "https://github.com/godlygeek/tabular/"; }; - tagalong-vim = buildVimPluginFrom2Nix { + tagalong-vim = buildVimPlugin { pname = "tagalong.vim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -9543,19 +9555,19 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; - tagbar = buildVimPluginFrom2Nix { + tagbar = buildVimPlugin { pname = "tagbar"; - version = "2023-08-15"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "402e3e117fc7b47e43dbb87c51064daae3bc3bf3"; - sha256 = "0cg7s68lr0282ci1r34ixnkvls830j2j5k5dr55vqqkqi7614n3p"; + rev = "5d6990e4fc5b3e3b88a3af90146f2561c4f6d828"; + sha256 = "08i5gx57hsj4840m1b85064077l3gbdiyxq04g6s1m1zpj0xq7zj"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; - taglist-vim = buildVimPluginFrom2Nix { + taglist-vim = buildVimPlugin { pname = "taglist.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9567,7 +9579,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; - targets-vim = buildVimPluginFrom2Nix { + targets-vim = buildVimPlugin { pname = "targets.vim"; version = "2023-02-22"; src = fetchFromGitHub { @@ -9579,7 +9591,7 @@ final: prev: meta.homepage = "https://github.com/wellle/targets.vim/"; }; - taskwiki = buildVimPluginFrom2Nix { + taskwiki = buildVimPlugin { pname = "taskwiki"; version = "2022-12-14"; src = fetchFromGitHub { @@ -9591,32 +9603,32 @@ final: prev: meta.homepage = "https://github.com/tools-life/taskwiki/"; }; - tcomment_vim = buildVimPluginFrom2Nix { + tcomment_vim = buildVimPlugin { pname = "tcomment_vim"; - version = "2022-12-17"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "b4930f9da28647e5417d462c341013f88184be7e"; - sha256 = "06nlnnrxh3jgnlcbbr7czpaz9v7n2g60mw28lshc14wzqpl01vvx"; + rev = "90eaf759099bcd47aa0471f974109d7fd78e4eea"; + sha256 = "169m394b5rc6x9sx92ir4p6h4ipclgvmlqmbxhf0phpmzldvgpaj"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; - telekasten-nvim = buildVimPluginFrom2Nix { + telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-09-08"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "bd5d323581f24ee124b33688287e6a22244c6f2a"; - sha256 = "0bp554glsjfhl1rbz4xfl536g5x962bqw8ss134j3cjpr5q4bf8d"; + rev = "3fd50c62c1ed2f973ce8639c1218445e4e91a962"; + sha256 = "0r7fcl8w93amzi4i30mp2amqnv3xahi62djzalfj11w6p3fbrg4l"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; }; - telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + telescope-asynctasks-nvim = buildVimPlugin { pname = "telescope-asynctasks.nvim"; version = "2022-04-09"; src = fetchFromGitHub { @@ -9628,7 +9640,7 @@ final: prev: meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; }; - telescope-cheat-nvim = buildVimPluginFrom2Nix { + telescope-cheat-nvim = buildVimPlugin { pname = "telescope-cheat.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9640,7 +9652,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; }; - telescope-coc-nvim = buildVimPluginFrom2Nix { + telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; version = "2023-02-16"; src = fetchFromGitHub { @@ -9652,7 +9664,7 @@ final: prev: meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; - telescope-dap-nvim = buildVimPluginFrom2Nix { + telescope-dap-nvim = buildVimPlugin { pname = "telescope-dap.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -9664,31 +9676,31 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; - telescope-file-browser-nvim = buildVimPluginFrom2Nix { + telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-09-15"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "bec4b0fd6c293f5c42d7929d8eff49e5af43e7f3"; - sha256 = "1rnda6ckr18xhwh9zfx9kvypbd7ynxxkf3k4ml2qz48m2y9gyadn"; + rev = "6e51d0cd6447cf2525412220ff0a2885eef9039c"; + sha256 = "1ksx2w2vaxnjyvj937la3fsiw7z0ary5qjnylxspw0zqp6d2ri9q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; - telescope-frecency-nvim = buildVimPluginFrom2Nix { + telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-08-27"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "fbda5d91d6e787f5977787fa4a81da5c8e22160a"; - sha256 = "1cm2jr0f719jhr4q5w8fh0c8qjncrvhck18h4g42xsgyhrkvfy2g"; + rev = "daf59744f60e34cbb48a40a092e9e735553b6f21"; + sha256 = "0mlfnhyz1daxmrfvvqmwpcqpqkl4nd5dqwz4ac539ffaca2mf6zb"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; - telescope-fzf-native-nvim = buildVimPluginFrom2Nix { + telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -9700,7 +9712,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; - telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { + telescope-fzf-writer-nvim = buildVimPlugin { pname = "telescope-fzf-writer.nvim"; version = "2021-04-16"; src = fetchFromGitHub { @@ -9712,7 +9724,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/"; }; - telescope-fzy-native-nvim = buildVimPluginFrom2Nix { + telescope-fzy-native-nvim = buildVimPlugin { pname = "telescope-fzy-native.nvim"; version = "2022-09-11"; src = fetchFromGitHub { @@ -9725,7 +9737,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; - telescope-github-nvim = buildVimPluginFrom2Nix { + telescope-github-nvim = buildVimPlugin { pname = "telescope-github.nvim"; version = "2022-04-22"; src = fetchFromGitHub { @@ -9737,7 +9749,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; - telescope-live-grep-args-nvim = buildVimPluginFrom2Nix { + telescope-live-grep-args-nvim = buildVimPlugin { pname = "telescope-live-grep-args.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -9749,7 +9761,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; - telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { + telescope-lsp-handlers-nvim = buildVimPlugin { pname = "telescope-lsp-handlers.nvim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -9763,17 +9775,17 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2023-09-11"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "392a883dec9d8ccfb1da3e10d1101ae34e627b97"; - sha256 = "0z2ir6gkr314aq7adiyjr06l876v61dkjf9n804kck5zwlbqyk30"; + rev = "af9d5446d8e3da97ae2fcf4075d19aacd71c1cca"; + sha256 = "0pybdgx20r1jmrg38iv0f6779wsypfx2fpmcvs3gb0qgjag180vv"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; - telescope-media-files-nvim = buildVimPluginFrom2Nix { + telescope-media-files-nvim = buildVimPlugin { pname = "telescope-media-files.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9785,7 +9797,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; }; - telescope-project-nvim = buildVimPluginFrom2Nix { + telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; version = "2023-04-27"; src = fetchFromGitHub { @@ -9797,7 +9809,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; - telescope-sg = buildVimPluginFrom2Nix { + telescope-sg = buildVimPlugin { pname = "telescope-sg"; version = "2023-08-09"; src = fetchFromGitHub { @@ -9809,7 +9821,7 @@ final: prev: meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; - telescope-symbols-nvim = buildVimPluginFrom2Nix { + telescope-symbols-nvim = buildVimPlugin { pname = "telescope-symbols.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9821,19 +9833,19 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; - telescope-ui-select-nvim = buildVimPluginFrom2Nix { + telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2022-04-30"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "62ea5e58c7bbe191297b983a9e7e89420f581369"; - sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw"; + rev = "b0015e6e4b46a64192c64b68dec9a9ac5a4e5690"; + sha256 = "1r8c29c6gd870ch7iyiln83y01hp73sgyh2rzq3cfzj4nx7fvgg2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; - telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + telescope-ultisnips-nvim = buildVimPlugin { pname = "telescope-ultisnips.nvim"; version = "2021-09-26"; src = fetchFromGitHub { @@ -9845,7 +9857,7 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; - telescope-undo-nvim = buildVimPluginFrom2Nix { + telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -9857,7 +9869,7 @@ final: prev: meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; - telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { + telescope-vim-bookmarks-nvim = buildVimPlugin { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; src = fetchFromGitHub { @@ -9869,7 +9881,7 @@ final: prev: meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/"; }; - telescope-z-nvim = buildVimPluginFrom2Nix { + telescope-z-nvim = buildVimPlugin { pname = "telescope-z.nvim"; version = "2023-08-17"; src = fetchFromGitHub { @@ -9881,7 +9893,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; - telescope-zf-native-nvim = buildVimPluginFrom2Nix { + telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; version = "2023-03-15"; src = fetchFromGitHub { @@ -9894,7 +9906,7 @@ final: prev: meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; }; - telescope-zoxide = buildVimPluginFrom2Nix { + telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; version = "2023-02-08"; src = fetchFromGitHub { @@ -9908,29 +9920,29 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-09-16"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "b543aaa2c9cf8123ed2fe7dbb6c211a9cd415124"; - sha256 = "0k0jymfkp9n65pb5iak7kf89pl41zr7iwg19ww31j3b814am4pjd"; + rev = "74ce793a60759e3db0d265174f137fb627430355"; + sha256 = "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; - telescope_hoogle = buildVimPluginFrom2Nix { + telescope_hoogle = buildVimPlugin { pname = "telescope_hoogle"; - version = "2022-10-27"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "luc-tielen"; repo = "telescope_hoogle"; - rev = "6322f74655a2773974377a8fc8d170c00f24938f"; - sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n"; + rev = "5c2ae51bcf905a7101134a597e6f7be2dc05f975"; + sha256 = "0nmzpyh9sdbvxf0hzvga748i4wnd0l6jmlwp8bmx84zazp93c667"; }; meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/"; }; - template-string-nvim = buildVimPluginFrom2Nix { + template-string-nvim = buildVimPlugin { pname = "template-string.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -9942,7 +9954,7 @@ final: prev: meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; - tender-vim = buildVimPluginFrom2Nix { + tender-vim = buildVimPlugin { pname = "tender.vim"; version = "2021-05-24"; src = fetchFromGitHub { @@ -9954,7 +9966,7 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; - term-edit-nvim = buildVimPluginFrom2Nix { + term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; version = "2023-07-30"; src = fetchFromGitHub { @@ -9966,19 +9978,19 @@ final: prev: meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; - terminus = buildVimPluginFrom2Nix { + terminus = buildVimPlugin { pname = "terminus"; - version = "2021-12-28"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "wincent"; repo = "terminus"; - rev = "12b07e390ea6346c91cd82edb0fa9b967164c38d"; - sha256 = "1s964165x466hjcd3ykfd38jaqh274yygnfw34a66rhgjvhmfzmi"; + rev = "51350e786d4bfcfc476abb015a3f90db3f81231f"; + sha256 = "0lvz87y22dc4jd6982r0k2d0bgyfwwjmcrcim78vvy6ymi58gmgw"; }; meta.homepage = "https://github.com/wincent/terminus/"; }; - termwrapper-nvim = buildVimPluginFrom2Nix { + termwrapper-nvim = buildVimPlugin { pname = "termwrapper.nvim"; version = "2021-03-28"; src = fetchFromGitHub { @@ -9990,7 +10002,7 @@ final: prev: meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/"; }; - tern_for_vim = buildVimPluginFrom2Nix { + tern_for_vim = buildVimPlugin { pname = "tern_for_vim"; version = "2019-01-23"; src = fetchFromGitHub { @@ -10002,7 +10014,7 @@ final: prev: meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; - tex-conceal-vim = buildVimPluginFrom2Nix { + tex-conceal-vim = buildVimPlugin { pname = "tex-conceal.vim"; version = "2022-01-15"; src = fetchFromGitHub { @@ -10014,7 +10026,7 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; }; - text-case-nvim = buildVimPluginFrom2Nix { + text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; version = "2023-09-03"; src = fetchFromGitHub { @@ -10026,7 +10038,7 @@ final: prev: meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; - thesaurus_query-vim = buildVimPluginFrom2Nix { + thesaurus_query-vim = buildVimPlugin { pname = "thesaurus_query.vim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -10038,7 +10050,7 @@ final: prev: meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; - thumbnail-vim = buildVimPluginFrom2Nix { + thumbnail-vim = buildVimPlugin { pname = "thumbnail.vim"; version = "2022-03-21"; src = fetchFromGitHub { @@ -10050,7 +10062,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; - timestamp-vim = buildVimPluginFrom2Nix { + timestamp-vim = buildVimPlugin { pname = "timestamp.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -10062,7 +10074,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; }; - tint-nvim = buildVimPluginFrom2Nix { + tint-nvim = buildVimPlugin { pname = "tint.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -10074,7 +10086,7 @@ final: prev: meta.homepage = "https://github.com/levouh/tint.nvim/"; }; - tlib_vim = buildVimPluginFrom2Nix { + tlib_vim = buildVimPlugin { pname = "tlib_vim"; version = "2022-07-22"; src = fetchFromGitHub { @@ -10086,7 +10098,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; - tmux-complete-vim = buildVimPluginFrom2Nix { + tmux-complete-vim = buildVimPlugin { pname = "tmux-complete.vim"; version = "2021-03-26"; src = fetchFromGitHub { @@ -10098,7 +10110,7 @@ final: prev: meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; - tmux-nvim = buildVimPluginFrom2Nix { + tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; version = "2023-09-06"; src = fetchFromGitHub { @@ -10110,7 +10122,7 @@ final: prev: meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; - tmuxline-vim = buildVimPluginFrom2Nix { + tmuxline-vim = buildVimPlugin { pname = "tmuxline.vim"; version = "2021-07-20"; src = fetchFromGitHub { @@ -10122,7 +10134,7 @@ final: prev: meta.homepage = "https://github.com/edkolev/tmuxline.vim/"; }; - todo-comments-nvim = buildVimPluginFrom2Nix { + todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -10134,7 +10146,7 @@ final: prev: meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; - todo-txt-vim = buildVimPluginFrom2Nix { + todo-txt-vim = buildVimPlugin { pname = "todo.txt-vim"; version = "2021-03-20"; src = fetchFromGitHub { @@ -10147,31 +10159,31 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; - toggleterm-nvim = buildVimPluginFrom2Nix { + toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-09-11"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "0427b908ebefcb3701c7f2cfbdafa37d11afe71a"; - sha256 = "1wxrwl530kxm8k8ymgk3w77av770ndr1hhzfk315jgl2p5hqmqm0"; + rev = "c80844fd52ba76f48fabf83e2b9f9b93273f418d"; + sha256 = "19rbq39m7c1v9yrfmlwmfmxgv5d9bwcjbgjdp3cin409fnl4rv6b"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; - tokyonight-nvim = buildVimPluginFrom2Nix { + tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-08-29"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "9a01eada39558dc3243278e6805d90e8dff45dc0"; - sha256 = "1rd7d16gqy9g2dixnsk186lqc17a4d1h5c2409s0xi7wzj7czw68"; + rev = "633039585dff7fd2b9b62fb190bf768702609d95"; + sha256 = "0akdw3v3xkzy5x3i684171haj93symddicjcr9mv631yqrgb7qil"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; - traces-vim = buildVimPluginFrom2Nix { + traces-vim = buildVimPlugin { pname = "traces.vim"; version = "2022-04-11"; src = fetchFromGitHub { @@ -10183,7 +10195,7 @@ final: prev: meta.homepage = "https://github.com/markonm/traces.vim/"; }; - train-nvim = buildVimPluginFrom2Nix { + train-nvim = buildVimPlugin { pname = "train.nvim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -10195,19 +10207,19 @@ final: prev: meta.homepage = "https://github.com/tjdevries/train.nvim/"; }; - treesj = buildVimPluginFrom2Nix { + treesj = buildVimPlugin { pname = "treesj"; - version = "2023-08-25"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "bff8c32b826e188fa558e94c7c93ac17a8ef0365"; - sha256 = "0m30d7d9bgs7ni2npgzd7h83l47a9phi4qs3g1za4znqsjj2wmbd"; + rev = "070e6761d0b11a55446d988a69908f7a0928dbab"; + sha256 = "0svwk7gzvz48xj7rwbda8j2zkw3ymm1ah9m2cvibvi34kx5qg8j2"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; - tremor-vim = buildVimPluginFrom2Nix { + tremor-vim = buildVimPlugin { pname = "tremor-vim"; version = "2021-09-07"; src = fetchFromGitHub { @@ -10219,31 +10231,31 @@ final: prev: meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; - trim-nvim = buildVimPluginFrom2Nix { + trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "2023-03-22"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e"; - sha256 = "1r4p93siid35q1r9kj8cgyin6i8zg033ifvamf19052mpnwli824"; + rev = "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7"; + sha256 = "1qm4n2biqqiwa0jqf60al969nz135i5pgn2pk123lxprb9q49wq5"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; - trouble-nvim = buildVimPluginFrom2Nix { + trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2023-08-30"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "3f85d8ed30e97ceeddbbcf80224245d347053711"; - sha256 = "0l1mf8mpf2q2wk983baj75hy30dm7hwncbfazrnimycqdyarxn6x"; + rev = "02219b557d4726a789be58c5d6bd6e139c46a9fe"; + sha256 = "0jvypyrb5ky84zkq5zvrxnlh0xb55szh3kddfmcsp0ba7zq9df0y"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; - true-zen-nvim = buildVimPluginFrom2Nix { + true-zen-nvim = buildVimPlugin { pname = "true-zen.nvim"; version = "2023-06-09"; src = fetchFromGitHub { @@ -10255,7 +10267,7 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; - tslime-vim = buildVimPluginFrom2Nix { + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; src = fetchFromGitHub { @@ -10267,43 +10279,55 @@ final: prev: meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; - tsuquyomi = buildVimPluginFrom2Nix { + tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; - version = "2022-04-12"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "8f6e2464171c5367867959093aa4b9c99b636a57"; - sha256 = "1h8gw0nlwd31yx6xd67c0bw4bw71rxpldlvmnfp8cxnpjiav3zkj"; + rev = "e1afca562d46907bf63270157c88b7ec8f66e46b"; + sha256 = "0viwjg5vp66xh4lv6iah3w3pdqh5wjd0yqs8h76rxmf83skb5vhk"; }; meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; - twilight-nvim = buildVimPluginFrom2Nix { + twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2023-05-22"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "a4843e6e67092a1e6fa9666f02bf0ab59174c1df"; - sha256 = "1d9c77kq55nyl5jlma4m1qg69hldm6zm75d0sjzc3ifq6f82ai0g"; + rev = "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4"; + sha256 = "0j3vvj1hdsxj36pi4fnfcnj34hk26igicnvzk6xch4rwjlakqlaq"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; - typescript-vim = buildVimPluginFrom2Nix { + typescript-tools-nvim = buildVimPlugin { + pname = "typescript-tools.nvim"; + version = "2023-10-13"; + src = fetchFromGitHub { + owner = "pmizio"; + repo = "typescript-tools.nvim"; + rev = "47c0461f652b90bc088bcaf6481d488d3b86291e"; + sha256 = "035973311zh2kl6gag0xp6wp5zjq96r2z0358ynw4sc2p07xsvrf"; + }; + meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; + }; + + typescript-vim = buildVimPlugin { pname = "typescript-vim"; - version = "2023-05-11"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "31ede5ad905ce4159a5e285073a391daa3bf83fa"; - sha256 = "0225jg2b3hswfq35cnnwv0m7w3ibakaly4s9ya2lq9vabsp9dgar"; + rev = "eafdcf5e9ee73b43d92372d69dd84458bf98c5e3"; + sha256 = "1ybc0ppr6xqx5ahg56xfcrs2v0h9dnsblqmgvx5xbz41lirh51h0"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; - typescript-nvim = buildVimPluginFrom2Nix { + typescript-nvim = buildVimPlugin { pname = "typescript.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -10315,31 +10339,31 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; }; - typst-vim = buildVimPluginFrom2Nix { + typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-09-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "1e672863c52184264dec59d234030a4898bb67cb"; - sha256 = "18ksiv66rjfw8hmysl8m7zkhd69w3dj7aqlfq6ph6vy0cqh6c4sf"; + rev = "a48691aff95240b7199fbabb82d28b4ca7ccbc3e"; + sha256 = "1l8hldprdknq2bmsliph2ayhkfkwzn11d2wj0cnhjhd0s6dmfn3i"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; - ultisnips = buildVimPluginFrom2Nix { + ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2023-08-05"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "24a3ebb36687b6d59a19d63173713575b486d739"; - sha256 = "0v6iq1mcnj1a6p2fks544wwhkgm0h8xnwr7ms427b1abvmj0sikz"; + rev = "f6d1501b630cb783b0af8507c5588328f826d40f"; + sha256 = "0h0rcqrfk4r48phlsb8nhvxb89vm9820lhbmkqvk1bqkjblsv279"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; - undotree = buildVimPluginFrom2Nix { + undotree = buildVimPlugin { pname = "undotree"; version = "2023-07-07"; src = fetchFromGitHub { @@ -10351,31 +10375,31 @@ final: prev: meta.homepage = "https://github.com/mbbill/undotree/"; }; - unicode-vim = buildVimPluginFrom2Nix { + unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "2023-03-19"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "c8aa12b1e2e1b6254885b12bdb239ce6c885fdb1"; - sha256 = "1mvsb0l9wi903rfazskgn0yzylcb1xkdaqvlcbj1w5yay372x4i9"; + rev = "bc20d0fb3331a7b41708388c56bb8221c2104da7"; + sha256 = "1nrx791gj66sky9bb039n7hwkvcic7wr1nrrb1vrx1sgqmwfpy6f"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; - unison = buildVimPluginFrom2Nix { + unison = buildVimPlugin { pname = "unison"; - version = "2023-09-14"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "bb06e1cce822f807c0e2db04c13c8cd5dad0803d"; - sha256 = "11qichfhqadp0xhral514szaq5bcc6ymf3cph0xy92sgk0a9rn27"; + rev = "d5e809b87f154c07d511cb1f164fdfad1c7926b1"; + sha256 = "0z0s94lp1xvy8wnh5y5g0ww5i8q6j5pp1xm2nkkx95cki0p65n1n"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; - unite-vim = buildVimPluginFrom2Nix { + unite-vim = buildVimPlugin { pname = "unite.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -10387,19 +10411,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; - urlview-nvim = buildVimPluginFrom2Nix { + urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; - version = "2023-05-23"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "b183133fd25caa6dd98b415e0f62e51e061cd522"; - sha256 = "0ychlw7lnnpmjflb5f5xyspv63kyrdzbxx88aw9ifaqiiyz3i4aq"; + rev = "bdbdf1e020e283551f003e71b0004096c746ef57"; + sha256 = "1bf226s400vyjffr6zqx9kr52qznzcgx1jnh356vfx3fjxsq81nl"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; - utl-vim = buildVimPluginFrom2Nix { + utl-vim = buildVimPlugin { pname = "utl.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -10411,7 +10435,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/utl.vim/"; }; - vCoolor-vim = buildVimPluginFrom2Nix { + vCoolor-vim = buildVimPlugin { pname = "vCoolor.vim"; version = "2020-10-14"; src = fetchFromGitHub { @@ -10423,7 +10447,7 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; - vader-vim = buildVimPluginFrom2Nix { + vader-vim = buildVimPlugin { pname = "vader.vim"; version = "2020-02-13"; src = fetchFromGitHub { @@ -10435,7 +10459,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vader.vim/"; }; - venn-nvim = buildVimPluginFrom2Nix { + venn-nvim = buildVimPlugin { pname = "venn.nvim"; version = "2022-11-22"; src = fetchFromGitHub { @@ -10447,7 +10471,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; - verilog_systemverilog-vim = buildVimPluginFrom2Nix { + verilog_systemverilog-vim = buildVimPlugin { pname = "verilog_systemverilog.vim"; version = "2023-08-11"; src = fetchFromGitHub { @@ -10459,19 +10483,19 @@ final: prev: meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vifm-vim = buildVimPluginFrom2Nix { + vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-08-24"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "8b671c02525b6772ba9a8a38d17d0f06bfcb06bd"; - sha256 = "1v7gav6nzlzsv9jwyqbwbw73cch9m5ccq47nkrgmk702nyv7sq7s"; + rev = "840fa94041f432c7fb72ff60081913742eb7551f"; + sha256 = "0ijgp6ka1rd5mdbrs79kpyh7dn87y8y097hmyb8a9fn05lpp632p"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; - vim-CtrlXA = buildVimPluginFrom2Nix { + vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; version = "2023-05-17"; src = fetchFromGitHub { @@ -10483,7 +10507,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; - vim-DetectSpellLang = buildVimPluginFrom2Nix { + vim-DetectSpellLang = buildVimPlugin { pname = "vim-DetectSpellLang"; version = "2022-03-15"; src = fetchFromGitHub { @@ -10495,7 +10519,7 @@ final: prev: meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; - vim-LanguageTool = buildVimPluginFrom2Nix { + vim-LanguageTool = buildVimPlugin { pname = "vim-LanguageTool"; version = "2021-02-08"; src = fetchFromGitHub { @@ -10507,7 +10531,7 @@ final: prev: meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; - vim-ReplaceWithRegister = buildVimPluginFrom2Nix { + vim-ReplaceWithRegister = buildVimPlugin { pname = "vim-ReplaceWithRegister"; version = "2021-07-05"; src = fetchFromGitHub { @@ -10519,7 +10543,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/"; }; - vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix { + vim-ReplaceWithSameIndentRegister = buildVimPlugin { pname = "vim-ReplaceWithSameIndentRegister"; version = "2020-06-17"; src = fetchFromGitHub { @@ -10531,7 +10555,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/"; }; - vim-SyntaxRange = buildVimPluginFrom2Nix { + vim-SyntaxRange = buildVimPlugin { pname = "vim-SyntaxRange"; version = "2021-01-16"; src = fetchFromGitHub { @@ -10543,19 +10567,19 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; - vim-abolish = buildVimPluginFrom2Nix { + vim-abolish = buildVimPlugin { pname = "vim-abolish"; - version = "2023-04-10"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "cb3dcb220262777082f63972298d57ef9e9455ec"; - sha256 = "0xriiima13cv84jlv37qd6ab4l6fjapqd8a8xsr5c87k0kkyyg13"; + rev = "dcbfe065297d31823561ba787f51056c147aa682"; + sha256 = "1yvpk0cnsx1b1q2wp52fv4mj71w8ssz4dcbbdix65m8qna6d0m9h"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; - vim-addon-actions = buildVimPluginFrom2Nix { + vim-addon-actions = buildVimPlugin { pname = "vim-addon-actions"; version = "2023-02-15"; src = fetchFromGitHub { @@ -10567,7 +10591,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; - vim-addon-async = buildVimPluginFrom2Nix { + vim-addon-async = buildVimPlugin { pname = "vim-addon-async"; version = "2017-03-20"; src = fetchFromGitHub { @@ -10579,7 +10603,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-async/"; }; - vim-addon-background-cmd = buildVimPluginFrom2Nix { + vim-addon-background-cmd = buildVimPlugin { pname = "vim-addon-background-cmd"; version = "2015-12-11"; src = fetchFromGitHub { @@ -10591,7 +10615,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-background-cmd/"; }; - vim-addon-commenting = buildVimPluginFrom2Nix { + vim-addon-commenting = buildVimPlugin { pname = "vim-addon-commenting"; version = "2013-06-10"; src = fetchFromGitHub { @@ -10603,7 +10627,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-commenting/"; }; - vim-addon-completion = buildVimPluginFrom2Nix { + vim-addon-completion = buildVimPlugin { pname = "vim-addon-completion"; version = "2015-02-10"; src = fetchFromGitHub { @@ -10615,7 +10639,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-completion/"; }; - vim-addon-errorformats = buildVimPluginFrom2Nix { + vim-addon-errorformats = buildVimPlugin { pname = "vim-addon-errorformats"; version = "2022-08-28"; src = fetchFromGitHub { @@ -10627,7 +10651,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/"; }; - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { + vim-addon-goto-thing-at-cursor = buildVimPlugin { pname = "vim-addon-goto-thing-at-cursor"; version = "2020-02-07"; src = fetchFromGitHub { @@ -10639,7 +10663,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/"; }; - vim-addon-local-vimrc = buildVimPluginFrom2Nix { + vim-addon-local-vimrc = buildVimPlugin { pname = "vim-addon-local-vimrc"; version = "2023-02-28"; src = fetchFromGitHub { @@ -10651,7 +10675,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; - vim-addon-manager = buildVimPluginFrom2Nix { + vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; version = "2023-02-13"; src = fetchFromGitHub { @@ -10663,7 +10687,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; - vim-addon-mru = buildVimPluginFrom2Nix { + vim-addon-mru = buildVimPlugin { pname = "vim-addon-mru"; version = "2013-08-08"; src = fetchFromGitHub { @@ -10675,7 +10699,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; - vim-addon-mw-utils = buildVimPluginFrom2Nix { + vim-addon-mw-utils = buildVimPlugin { pname = "vim-addon-mw-utils"; version = "2020-02-07"; src = fetchFromGitHub { @@ -10687,7 +10711,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-mw-utils/"; }; - vim-addon-nix = buildVimPluginFrom2Nix { + vim-addon-nix = buildVimPlugin { pname = "vim-addon-nix"; version = "2017-09-11"; src = fetchFromGitHub { @@ -10699,7 +10723,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-nix/"; }; - vim-addon-other = buildVimPluginFrom2Nix { + vim-addon-other = buildVimPlugin { pname = "vim-addon-other"; version = "2021-10-06"; src = fetchFromGitHub { @@ -10711,7 +10735,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-other/"; }; - vim-addon-php-manual = buildVimPluginFrom2Nix { + vim-addon-php-manual = buildVimPlugin { pname = "vim-addon-php-manual"; version = "2015-01-01"; src = fetchFromGitHub { @@ -10723,7 +10747,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-php-manual/"; }; - vim-addon-signs = buildVimPluginFrom2Nix { + vim-addon-signs = buildVimPlugin { pname = "vim-addon-signs"; version = "2013-04-19"; src = fetchFromGitHub { @@ -10735,7 +10759,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-signs/"; }; - vim-addon-sql = buildVimPluginFrom2Nix { + vim-addon-sql = buildVimPlugin { pname = "vim-addon-sql"; version = "2017-02-11"; src = fetchFromGitHub { @@ -10747,7 +10771,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-sql/"; }; - vim-addon-syntax-checker = buildVimPluginFrom2Nix { + vim-addon-syntax-checker = buildVimPlugin { pname = "vim-addon-syntax-checker"; version = "2017-06-26"; src = fetchFromGitHub { @@ -10759,7 +10783,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-syntax-checker/"; }; - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { + vim-addon-toggle-buffer = buildVimPlugin { pname = "vim-addon-toggle-buffer"; version = "2012-01-13"; src = fetchFromGitHub { @@ -10771,7 +10795,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; - vim-addon-xdebug = buildVimPluginFrom2Nix { + vim-addon-xdebug = buildVimPlugin { pname = "vim-addon-xdebug"; version = "2014-08-29"; src = fetchFromGitHub { @@ -10783,7 +10807,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; - vim-after-object = buildVimPluginFrom2Nix { + vim-after-object = buildVimPlugin { pname = "vim-after-object"; version = "2018-09-17"; src = fetchFromGitHub { @@ -10795,31 +10819,31 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-after-object/"; }; - vim-agda = buildVimPluginFrom2Nix { + vim-agda = buildVimPlugin { pname = "vim-agda"; - version = "2022-03-01"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "msuperdock"; repo = "vim-agda"; - rev = "1695060850b5991e8aded0861fae0c31877950a7"; - sha256 = "0mr21s3x2c7qxay3a92iwhwwyir97s6g3vz8r3m40zxm91xdm7y6"; + rev = "36d6b9f2fd8b2bdc9cd70fad74298db09b694a57"; + sha256 = "149250pc0y44zqi1ya7kmkk0q4q78zmhpb7vannm4rk990sj0xjq"; }; meta.homepage = "https://github.com/msuperdock/vim-agda/"; }; - vim-airline = buildVimPluginFrom2Nix { + vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2023-07-19"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "e6bb8427dc2d2dc3583ed1bf5ff6a9682c854d32"; - sha256 = "0sbhpp8w1rdrh386j3q4n2zrwq1ipxb9107ddwlgs89nh5wbf4qv"; + rev = "3b9e149e19ed58dee66e4842626751e329e1bd96"; + sha256 = "03jycan9s1r02hg7irscd4kr094vhk555znqj1a4is3b7i6iwrbk"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; - vim-airline-clock = buildVimPluginFrom2Nix { + vim-airline-clock = buildVimPlugin { pname = "vim-airline-clock"; version = "2021-04-14"; src = fetchFromGitHub { @@ -10831,7 +10855,7 @@ final: prev: meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; }; - vim-airline-themes = buildVimPluginFrom2Nix { + vim-airline-themes = buildVimPlugin { pname = "vim-airline-themes"; version = "2022-11-08"; src = fetchFromGitHub { @@ -10843,7 +10867,7 @@ final: prev: meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; - vim-alias = buildVimPluginFrom2Nix { + vim-alias = buildVimPlugin { pname = "vim-alias"; version = "2021-05-25"; src = fetchFromGitHub { @@ -10855,19 +10879,19 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; - vim-android = buildVimPluginFrom2Nix { + vim-android = buildVimPlugin { pname = "vim-android"; - version = "2023-08-24"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "31c593b8025f62f184418dd658c3a358a8d0ef70"; - sha256 = "14l7v8jg4kq8qh9j64nxir4a7d9ls0zp6zk3rjzbzf9viqyw1bp5"; + rev = "26990f9fa27b23ca5faf83e14d56711c0fec40ea"; + sha256 = "1iy9ap2i9lmqcjaqb38syb240m834ifacv79cjiwzxcpr23vq4r1"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; - vim-anzu = buildVimPluginFrom2Nix { + vim-anzu = buildVimPlugin { pname = "vim-anzu"; version = "2022-12-18"; src = fetchFromGitHub { @@ -10879,7 +10903,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; - vim-apm = buildVimPluginFrom2Nix { + vim-apm = buildVimPlugin { pname = "vim-apm"; version = "2020-09-28"; src = fetchFromGitHub { @@ -10891,7 +10915,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; - vim-argumentative = buildVimPluginFrom2Nix { + vim-argumentative = buildVimPlugin { pname = "vim-argumentative"; version = "2014-11-24"; src = fetchFromGitHub { @@ -10903,19 +10927,19 @@ final: prev: meta.homepage = "https://github.com/PeterRincker/vim-argumentative/"; }; - vim-argwrap = buildVimPluginFrom2Nix { + vim-argwrap = buildVimPlugin { pname = "vim-argwrap"; - version = "2022-07-14"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "feaba6b8b6ca099d267c81ee2c4ba43ce6de8499"; - sha256 = "08hjsxwm0fxgc54awzr7fmq1mrddq3rah40wnj44l4lsd73f5lba"; + rev = "b532cb6805864da4cfcfe0bb6a1ced61e291be02"; + sha256 = "1z51vrh49260aydz135mmq3k8912k8svbg6l4n83ghfjjzdlp5q0"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; - vim-asterisk = buildVimPluginFrom2Nix { + vim-asterisk = buildVimPlugin { pname = "vim-asterisk"; version = "2020-02-03"; src = fetchFromGitHub { @@ -10927,19 +10951,19 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; - vim-astro = buildVimPluginFrom2Nix { + vim-astro = buildVimPlugin { pname = "vim-astro"; - version = "2022-08-25"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "wuelnerdotexe"; repo = "vim-astro"; - rev = "34732be5e9a5c28c2409f4490edf92d46d8b55a9"; - sha256 = "1ild33hxiphj0z8b4kpcad4rai7q7jd0lsmhpa30kfgmyj5kh90z"; + rev = "9b0d948aaf8c3f2bfbc97690e79d7ec115cc3576"; + sha256 = "04gy9ymzrjsdr3806d077ziynpnq1rf4q4gfl6vnvfn4jkxg3m91"; }; meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/"; }; - vim-asymptote = buildVimPluginFrom2Nix { + vim-asymptote = buildVimPlugin { pname = "vim-asymptote"; version = "2014-06-26"; src = fetchFromGitHub { @@ -10951,7 +10975,7 @@ final: prev: meta.homepage = "https://github.com/hura/vim-asymptote/"; }; - vim-auto-save = buildVimPluginFrom2Nix { + vim-auto-save = buildVimPlugin { pname = "vim-auto-save"; version = "2022-08-08"; src = fetchFromGitHub { @@ -10963,7 +10987,7 @@ final: prev: meta.homepage = "https://github.com/907th/vim-auto-save/"; }; - vim-autoformat = buildVimPluginFrom2Nix { + vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; version = "2023-08-26"; src = fetchFromGitHub { @@ -10975,7 +10999,7 @@ final: prev: meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; - vim-automkdir = buildVimPluginFrom2Nix { + vim-automkdir = buildVimPlugin { pname = "vim-automkdir"; version = "2016-01-17"; src = fetchFromGitHub { @@ -10987,7 +11011,7 @@ final: prev: meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; - vim-autosource = buildVimPluginFrom2Nix { + vim-autosource = buildVimPlugin { pname = "vim-autosource"; version = "2021-12-22"; src = fetchFromGitHub { @@ -10999,7 +11023,7 @@ final: prev: meta.homepage = "https://github.com/jenterkin/vim-autosource/"; }; - vim-autoswap = buildVimPluginFrom2Nix { + vim-autoswap = buildVimPlugin { pname = "vim-autoswap"; version = "2019-01-09"; src = fetchFromGitHub { @@ -11011,7 +11035,7 @@ final: prev: meta.homepage = "https://github.com/gioele/vim-autoswap/"; }; - vim-bazel = buildVimPluginFrom2Nix { + vim-bazel = buildVimPlugin { pname = "vim-bazel"; version = "2022-04-09"; src = fetchFromGitHub { @@ -11023,7 +11047,7 @@ final: prev: meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; - vim-bbye = buildVimPluginFrom2Nix { + vim-bbye = buildVimPlugin { pname = "vim-bbye"; version = "2018-03-03"; src = fetchFromGitHub { @@ -11035,7 +11059,7 @@ final: prev: meta.homepage = "https://github.com/moll/vim-bbye/"; }; - vim-be-good = buildVimPluginFrom2Nix { + vim-be-good = buildVimPlugin { pname = "vim-be-good"; version = "2022-11-08"; src = fetchFromGitHub { @@ -11047,7 +11071,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-be-good/"; }; - vim-beancount = buildVimPluginFrom2Nix { + vim-beancount = buildVimPlugin { pname = "vim-beancount"; version = "2023-01-02"; src = fetchFromGitHub { @@ -11059,7 +11083,7 @@ final: prev: meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; - vim-bepoptimist = buildVimPluginFrom2Nix { + vim-bepoptimist = buildVimPlugin { pname = "vim-bepoptimist"; version = "2022-06-24"; src = fetchFromGitHub { @@ -11071,7 +11095,7 @@ final: prev: meta.homepage = "https://github.com/sheoak/vim-bepoptimist/"; }; - vim-better-whitespace = buildVimPluginFrom2Nix { + vim-better-whitespace = buildVimPlugin { pname = "vim-better-whitespace"; version = "2022-06-30"; src = fetchFromGitHub { @@ -11083,7 +11107,7 @@ final: prev: meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; - vim-bookmarks = buildVimPluginFrom2Nix { + vim-bookmarks = buildVimPlugin { pname = "vim-bookmarks"; version = "2021-08-22"; src = fetchFromGitHub { @@ -11095,7 +11119,7 @@ final: prev: meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; }; - vim-boxdraw = buildVimPluginFrom2Nix { + vim-boxdraw = buildVimPlugin { pname = "vim-boxdraw"; version = "2021-01-28"; src = fetchFromGitHub { @@ -11107,7 +11131,7 @@ final: prev: meta.homepage = "https://github.com/gyim/vim-boxdraw/"; }; - vim-bracketed-paste = buildVimPluginFrom2Nix { + vim-bracketed-paste = buildVimPlugin { pname = "vim-bracketed-paste"; version = "2022-03-21"; src = fetchFromGitHub { @@ -11119,7 +11143,7 @@ final: prev: meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; }; - vim-bsv = buildVimPluginFrom2Nix { + vim-bsv = buildVimPlugin { pname = "vim-bsv"; version = "2020-11-08"; src = fetchFromGitHub { @@ -11131,7 +11155,7 @@ final: prev: meta.homepage = "https://github.com/mtikekar/vim-bsv/"; }; - vim-buffergator = buildVimPluginFrom2Nix { + vim-buffergator = buildVimPlugin { pname = "vim-buffergator"; version = "2021-11-28"; src = fetchFromGitHub { @@ -11143,7 +11167,7 @@ final: prev: meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; - vim-bufferline = buildVimPluginFrom2Nix { + vim-bufferline = buildVimPlugin { pname = "vim-bufferline"; version = "2016-02-09"; src = fetchFromGitHub { @@ -11155,7 +11179,7 @@ final: prev: meta.homepage = "https://github.com/bling/vim-bufferline/"; }; - vim-bufkill = buildVimPluginFrom2Nix { + vim-bufkill = buildVimPlugin { pname = "vim-bufkill"; version = "2022-04-19"; src = fetchFromGitHub { @@ -11167,7 +11191,7 @@ final: prev: meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; - vim-caddyfile = buildVimPluginFrom2Nix { + vim-caddyfile = buildVimPlugin { pname = "vim-caddyfile"; version = "2022-05-09"; src = fetchFromGitHub { @@ -11179,7 +11203,7 @@ final: prev: meta.homepage = "https://github.com/isobit/vim-caddyfile/"; }; - vim-capslock = buildVimPluginFrom2Nix { + vim-capslock = buildVimPlugin { pname = "vim-capslock"; version = "2023-04-26"; src = fetchFromGitHub { @@ -11191,7 +11215,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-capslock/"; }; - vim-carbon-now-sh = buildVimPluginFrom2Nix { + vim-carbon-now-sh = buildVimPlugin { pname = "vim-carbon-now-sh"; version = "2022-08-11"; src = fetchFromGitHub { @@ -11203,7 +11227,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; - vim-ccls = buildVimPluginFrom2Nix { + vim-ccls = buildVimPlugin { pname = "vim-ccls"; version = "2022-04-23"; src = fetchFromGitHub { @@ -11215,7 +11239,7 @@ final: prev: meta.homepage = "https://github.com/m-pilia/vim-ccls/"; }; - vim-choosewin = buildVimPluginFrom2Nix { + vim-choosewin = buildVimPlugin { pname = "vim-choosewin"; version = "2021-04-22"; src = fetchFromGitHub { @@ -11227,7 +11251,7 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-choosewin/"; }; - vim-clang-format = buildVimPluginFrom2Nix { + vim-clang-format = buildVimPlugin { pname = "vim-clang-format"; version = "2021-12-04"; src = fetchFromGitHub { @@ -11239,7 +11263,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; - vim-clojure-highlight = buildVimPluginFrom2Nix { + vim-clojure-highlight = buildVimPlugin { pname = "vim-clojure-highlight"; version = "2015-07-05"; src = fetchFromGitHub { @@ -11251,7 +11275,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-clojure-highlight/"; }; - vim-clojure-static = buildVimPluginFrom2Nix { + vim-clojure-static = buildVimPlugin { pname = "vim-clojure-static"; version = "2017-10-23"; src = fetchFromGitHub { @@ -11263,7 +11287,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; - vim-closer = buildVimPluginFrom2Nix { + vim-closer = buildVimPlugin { pname = "vim-closer"; version = "2022-11-01"; src = fetchFromGitHub { @@ -11275,7 +11299,7 @@ final: prev: meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; - vim-closetag = buildVimPluginFrom2Nix { + vim-closetag = buildVimPlugin { pname = "vim-closetag"; version = "2022-05-22"; src = fetchFromGitHub { @@ -11287,7 +11311,7 @@ final: prev: meta.homepage = "https://github.com/alvan/vim-closetag/"; }; - vim-cmake = buildVimPluginFrom2Nix { + vim-cmake = buildVimPlugin { pname = "vim-cmake"; version = "2021-06-25"; src = fetchFromGitHub { @@ -11299,7 +11323,7 @@ final: prev: meta.homepage = "https://github.com/vhdirk/vim-cmake/"; }; - vim-code-dark = buildVimPluginFrom2Nix { + vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; version = "2023-07-18"; src = fetchFromGitHub { @@ -11311,7 +11335,7 @@ final: prev: meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; - vim-codefmt = buildVimPluginFrom2Nix { + vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; version = "2023-08-22"; src = fetchFromGitHub { @@ -11323,7 +11347,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-codefmt/"; }; - vim-coffee-script = buildVimPluginFrom2Nix { + vim-coffee-script = buildVimPlugin { pname = "vim-coffee-script"; version = "2020-12-20"; src = fetchFromGitHub { @@ -11335,7 +11359,7 @@ final: prev: meta.homepage = "https://github.com/kchmck/vim-coffee-script/"; }; - vim-colemak = buildVimPluginFrom2Nix { + vim-colemak = buildVimPlugin { pname = "vim-colemak"; version = "2016-10-16"; src = fetchFromGitHub { @@ -11347,7 +11371,7 @@ final: prev: meta.homepage = "https://github.com/kalbasit/vim-colemak/"; }; - vim-colors-solarized = buildVimPluginFrom2Nix { + vim-colors-solarized = buildVimPlugin { pname = "vim-colors-solarized"; version = "2011-05-09"; src = fetchFromGitHub { @@ -11359,7 +11383,7 @@ final: prev: meta.homepage = "https://github.com/altercation/vim-colors-solarized/"; }; - vim-colorschemes = buildVimPluginFrom2Nix { + vim-colorschemes = buildVimPlugin { pname = "vim-colorschemes"; version = "2020-05-15"; src = fetchFromGitHub { @@ -11371,7 +11395,7 @@ final: prev: meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; - vim-colorstepper = buildVimPluginFrom2Nix { + vim-colorstepper = buildVimPlugin { pname = "vim-colorstepper"; version = "2016-01-28"; src = fetchFromGitHub { @@ -11383,7 +11407,7 @@ final: prev: meta.homepage = "https://github.com/jonbri/vim-colorstepper/"; }; - vim-commentary = buildVimPluginFrom2Nix { + vim-commentary = buildVimPlugin { pname = "vim-commentary"; version = "2022-10-31"; src = fetchFromGitHub { @@ -11395,7 +11419,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-commentary/"; }; - vim-concourse = buildVimPluginFrom2Nix { + vim-concourse = buildVimPlugin { pname = "vim-concourse"; version = "2016-11-21"; src = fetchFromGitHub { @@ -11407,7 +11431,7 @@ final: prev: meta.homepage = "https://github.com/luan/vim-concourse/"; }; - vim-cool = buildVimPluginFrom2Nix { + vim-cool = buildVimPlugin { pname = "vim-cool"; version = "2023-09-06"; src = fetchFromGitHub { @@ -11419,7 +11443,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-cool/"; }; - vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { + vim-cpp-enhanced-highlight = buildVimPlugin { pname = "vim-cpp-enhanced-highlight"; version = "2021-04-19"; src = fetchFromGitHub { @@ -11431,7 +11455,7 @@ final: prev: meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; - vim-crates = buildVimPluginFrom2Nix { + vim-crates = buildVimPlugin { pname = "vim-crates"; version = "2021-05-07"; src = fetchFromGitHub { @@ -11443,7 +11467,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-crates/"; }; - vim-crystal = buildVimPluginFrom2Nix { + vim-crystal = buildVimPlugin { pname = "vim-crystal"; version = "2023-03-15"; src = fetchFromGitHub { @@ -11455,7 +11479,7 @@ final: prev: meta.homepage = "https://github.com/vim-crystal/vim-crystal/"; }; - vim-csharp = buildVimPluginFrom2Nix { + vim-csharp = buildVimPlugin { pname = "vim-csharp"; version = "2017-03-29"; src = fetchFromGitHub { @@ -11467,7 +11491,7 @@ final: prev: meta.homepage = "https://github.com/OrangeT/vim-csharp/"; }; - vim-css-color = buildVimPluginFrom2Nix { + vim-css-color = buildVimPlugin { pname = "vim-css-color"; version = "2023-07-26"; src = fetchFromGitHub { @@ -11479,7 +11503,7 @@ final: prev: meta.homepage = "https://github.com/ap/vim-css-color/"; }; - vim-cue = buildVimPluginFrom2Nix { + vim-cue = buildVimPlugin { pname = "vim-cue"; version = "2021-06-18"; src = fetchFromGitHub { @@ -11491,7 +11515,7 @@ final: prev: meta.homepage = "https://github.com/jjo/vim-cue/"; }; - vim-cursorword = buildVimPluginFrom2Nix { + vim-cursorword = buildVimPlugin { pname = "vim-cursorword"; version = "2022-11-17"; src = fetchFromGitHub { @@ -11503,7 +11527,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; - vim-cute-python = buildVimPluginFrom2Nix { + vim-cute-python = buildVimPlugin { pname = "vim-cute-python"; version = "2020-11-17"; src = fetchFromGitHub { @@ -11515,43 +11539,43 @@ final: prev: meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; - vim-dadbod = buildVimPluginFrom2Nix { + vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2023-05-22"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "7d80bbd11c407a09e0f7b869c38f3dec3902805f"; - sha256 = "12aawycg41vi1jznnf8ln2qwflsa63cmlzkxrxj8mbvfjlckq26x"; + rev = "ee7e3bb5377d43cb31a101718dd0cfc09bb87d4b"; + sha256 = "1kh3fbk0lpasan90n17zg5fjsqr01ppfxpjl638mga0hq0ma7l1m"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; - vim-dadbod-completion = buildVimPluginFrom2Nix { + vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2023-04-25"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "fc7321a17f4c55db11fae89a884ddf4724020bae"; - sha256 = "1y3yx8zzlca47b3yswsyj3z9zx43xnx6nrvxjabm6wxl2dhgxhqw"; + rev = "bcdf3ff768cc7e544a0f78b0383d8719c2116569"; + sha256 = "1dnmm54inx7qbwk5dbng1g4448hfcls2fzld36i7dgv3calplg9z"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; - vim-dadbod-ui = buildVimPluginFrom2Nix { + vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2023-09-15"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0df3e984ba43d1688e4223315b4f27cbb556f6ad"; - sha256 = "1kb3h7y0bmnrb5g6mwkwcf1y3bm8yc85f0sfgzzybca0y3dbp7ii"; + rev = "95fd22469507e86b78aa55d868c14108adee2881"; + sha256 = "049bqzh61rj3xril9mxb8h75jr074126pgvq65c90h4rm9ddk4ql"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; - vim-dasht = buildVimPluginFrom2Nix { + vim-dasht = buildVimPlugin { pname = "vim-dasht"; version = "2023-01-31"; src = fetchFromGitHub { @@ -11563,7 +11587,7 @@ final: prev: meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; - vim-deus = buildVimPluginFrom2Nix { + vim-deus = buildVimPlugin { pname = "vim-deus"; version = "2021-03-28"; src = fetchFromGitHub { @@ -11575,7 +11599,7 @@ final: prev: meta.homepage = "https://github.com/ajmwagar/vim-deus/"; }; - vim-devicons = buildVimPluginFrom2Nix { + vim-devicons = buildVimPlugin { pname = "vim-devicons"; version = "2022-10-01"; src = fetchFromGitHub { @@ -11587,7 +11611,7 @@ final: prev: meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; - vim-dim = buildVimPluginFrom2Nix { + vim-dim = buildVimPlugin { pname = "vim-dim"; version = "2021-01-29"; src = fetchFromGitHub { @@ -11599,7 +11623,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/vim-dim/"; }; - vim-diminactive = buildVimPluginFrom2Nix { + vim-diminactive = buildVimPlugin { pname = "vim-diminactive"; version = "2017-08-27"; src = fetchFromGitHub { @@ -11611,7 +11635,7 @@ final: prev: meta.homepage = "https://github.com/blueyed/vim-diminactive/"; }; - vim-dirdiff = buildVimPluginFrom2Nix { + vim-dirdiff = buildVimPlugin { pname = "vim-dirdiff"; version = "2021-06-03"; src = fetchFromGitHub { @@ -11623,7 +11647,7 @@ final: prev: meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; - vim-dirvish = buildVimPluginFrom2Nix { + vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; version = "2023-06-18"; src = fetchFromGitHub { @@ -11635,7 +11659,7 @@ final: prev: meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; - vim-dirvish-git = buildVimPluginFrom2Nix { + vim-dirvish-git = buildVimPlugin { pname = "vim-dirvish-git"; version = "2021-05-22"; src = fetchFromGitHub { @@ -11647,7 +11671,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; }; - vim-dispatch = buildVimPluginFrom2Nix { + vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; version = "2023-02-05"; src = fetchFromGitHub { @@ -11659,7 +11683,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; - vim-dispatch-neovim = buildVimPluginFrom2Nix { + vim-dispatch-neovim = buildVimPlugin { pname = "vim-dispatch-neovim"; version = "2017-01-18"; src = fetchFromGitHub { @@ -11671,7 +11695,7 @@ final: prev: meta.homepage = "https://github.com/radenling/vim-dispatch-neovim/"; }; - vim-docbk = buildVimPluginFrom2Nix { + vim-docbk = buildVimPlugin { pname = "vim-docbk"; version = "2015-04-01"; src = fetchFromGitHub { @@ -11683,7 +11707,7 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; - vim-dotenv = buildVimPluginFrom2Nix { + vim-dotenv = buildVimPlugin { pname = "vim-dotenv"; version = "2022-05-15"; src = fetchFromGitHub { @@ -11695,7 +11719,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dotenv/"; }; - vim-easy-align = buildVimPluginFrom2Nix { + vim-easy-align = buildVimPlugin { pname = "vim-easy-align"; version = "2019-04-29"; src = fetchFromGitHub { @@ -11707,7 +11731,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; - vim-easyescape = buildVimPluginFrom2Nix { + vim-easyescape = buildVimPlugin { pname = "vim-easyescape"; version = "2020-11-22"; src = fetchFromGitHub { @@ -11719,7 +11743,7 @@ final: prev: meta.homepage = "https://github.com/zhou13/vim-easyescape/"; }; - vim-easygit = buildVimPluginFrom2Nix { + vim-easygit = buildVimPlugin { pname = "vim-easygit"; version = "2018-07-08"; src = fetchFromGitHub { @@ -11731,7 +11755,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/vim-easygit/"; }; - vim-easymotion = buildVimPluginFrom2Nix { + vim-easymotion = buildVimPlugin { pname = "vim-easymotion"; version = "2022-04-04"; src = fetchFromGitHub { @@ -11743,7 +11767,7 @@ final: prev: meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; - vim-easytags = buildVimPluginFrom2Nix { + vim-easytags = buildVimPlugin { pname = "vim-easytags"; version = "2015-07-01"; src = fetchFromGitHub { @@ -11755,7 +11779,7 @@ final: prev: meta.homepage = "https://github.com/xolox/vim-easytags/"; }; - vim-eighties = buildVimPluginFrom2Nix { + vim-eighties = buildVimPlugin { pname = "vim-eighties"; version = "2016-12-15"; src = fetchFromGitHub { @@ -11767,7 +11791,7 @@ final: prev: meta.homepage = "https://github.com/justincampbell/vim-eighties/"; }; - vim-elixir = buildVimPluginFrom2Nix { + vim-elixir = buildVimPlugin { pname = "vim-elixir"; version = "2022-06-25"; src = fetchFromGitHub { @@ -11779,7 +11803,7 @@ final: prev: meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; - vim-elm-syntax = buildVimPluginFrom2Nix { + vim-elm-syntax = buildVimPlugin { pname = "vim-elm-syntax"; version = "2021-01-09"; src = fetchFromGitHub { @@ -11791,7 +11815,7 @@ final: prev: meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; - vim-emoji = buildVimPluginFrom2Nix { + vim-emoji = buildVimPlugin { pname = "vim-emoji"; version = "2018-01-30"; src = fetchFromGitHub { @@ -11803,7 +11827,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-emoji/"; }; - vim-endwise = buildVimPluginFrom2Nix { + vim-endwise = buildVimPlugin { pname = "vim-endwise"; version = "2023-04-23"; src = fetchFromGitHub { @@ -11815,7 +11839,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-endwise/"; }; - vim-enmasse = buildVimPluginFrom2Nix { + vim-enmasse = buildVimPlugin { pname = "vim-enmasse"; version = "2018-04-03"; src = fetchFromGitHub { @@ -11827,7 +11851,7 @@ final: prev: meta.homepage = "https://github.com/Olical/vim-enmasse/"; }; - vim-erlang-compiler = buildVimPluginFrom2Nix { + vim-erlang-compiler = buildVimPlugin { pname = "vim-erlang-compiler"; version = "2021-06-20"; src = fetchFromGitHub { @@ -11839,7 +11863,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; }; - vim-erlang-omnicomplete = buildVimPluginFrom2Nix { + vim-erlang-omnicomplete = buildVimPlugin { pname = "vim-erlang-omnicomplete"; version = "2021-07-03"; src = fetchFromGitHub { @@ -11851,7 +11875,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; }; - vim-erlang-runtime = buildVimPluginFrom2Nix { + vim-erlang-runtime = buildVimPlugin { pname = "vim-erlang-runtime"; version = "2022-10-02"; src = fetchFromGitHub { @@ -11863,7 +11887,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; - vim-erlang-tags = buildVimPluginFrom2Nix { + vim-erlang-tags = buildVimPlugin { pname = "vim-erlang-tags"; version = "2022-04-02"; src = fetchFromGitHub { @@ -11875,7 +11899,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; - vim-eunuch = buildVimPluginFrom2Nix { + vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; version = "2023-06-28"; src = fetchFromGitHub { @@ -11887,7 +11911,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; - vim-exchange = buildVimPluginFrom2Nix { + vim-exchange = buildVimPlugin { pname = "vim-exchange"; version = "2021-10-21"; src = fetchFromGitHub { @@ -11899,7 +11923,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; - vim-expand-region = buildVimPluginFrom2Nix { + vim-expand-region = buildVimPlugin { pname = "vim-expand-region"; version = "2013-08-19"; src = fetchFromGitHub { @@ -11911,7 +11935,7 @@ final: prev: meta.homepage = "https://github.com/terryma/vim-expand-region/"; }; - vim-extradite = buildVimPluginFrom2Nix { + vim-extradite = buildVimPlugin { pname = "vim-extradite"; version = "2022-04-15"; src = fetchFromGitHub { @@ -11923,7 +11947,7 @@ final: prev: meta.homepage = "https://github.com/int3/vim-extradite/"; }; - vim-fetch = buildVimPluginFrom2Nix { + vim-fetch = buildVimPlugin { pname = "vim-fetch"; version = "2023-05-29"; src = fetchFromGitHub { @@ -11935,7 +11959,7 @@ final: prev: meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; - vim-figlet = buildVimPluginFrom2Nix { + vim-figlet = buildVimPlugin { pname = "vim-figlet"; version = "2022-12-08"; src = fetchFromGitHub { @@ -11947,7 +11971,7 @@ final: prev: meta.homepage = "https://github.com/fadein/vim-figlet/"; }; - vim-fireplace = buildVimPluginFrom2Nix { + vim-fireplace = buildVimPlugin { pname = "vim-fireplace"; version = "2023-03-26"; src = fetchFromGitHub { @@ -11959,7 +11983,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; - vim-fish = buildVimPluginFrom2Nix { + vim-fish = buildVimPlugin { pname = "vim-fish"; version = "2017-11-22"; src = fetchFromGitHub { @@ -11971,7 +11995,7 @@ final: prev: meta.homepage = "https://github.com/dag/vim-fish/"; }; - vim-flagship = buildVimPluginFrom2Nix { + vim-flagship = buildVimPlugin { pname = "vim-flagship"; version = "2023-08-26"; src = fetchFromGitHub { @@ -11983,19 +12007,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-flagship/"; }; - vim-flake8 = buildVimPluginFrom2Nix { + vim-flake8 = buildVimPlugin { pname = "vim-flake8"; - version = "2023-03-22"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "5b950566e20d877184a06b1d2fe8bad0998b3ece"; - sha256 = "1mpj8n38fr1gfp65cah4w141cw381ms17zwmvl2iga2hz60rnz0d"; + rev = "a245098a174f30feff1b4387526876975042084a"; + sha256 = "1js26bxfl7csdffrwc0b3wwal81w18fznw6dnks40wr3iv62y2jd"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; - vim-flatbuffers = buildVimPluginFrom2Nix { + vim-flatbuffers = buildVimPlugin { pname = "vim-flatbuffers"; version = "2018-10-11"; src = fetchFromGitHub { @@ -12007,19 +12031,19 @@ final: prev: meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; - vim-floaterm = buildVimPluginFrom2Nix { + vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-09-02"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd"; - sha256 = "184nd73bw19vrf5avx345fcnlf8jbvbfnykjsa1xgj9q1wxrxprl"; + rev = "6e81602e9d7ff7dc1c96c66fedc38fca1262d57c"; + sha256 = "1354apq2hcizp96p5y3ig2v8i0aq358qyifi8m3qzx6sh5ql0vgp"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; - vim-flog = buildVimPluginFrom2Nix { + vim-flog = buildVimPlugin { pname = "vim-flog"; version = "2023-09-02"; src = fetchFromGitHub { @@ -12031,7 +12055,7 @@ final: prev: meta.homepage = "https://github.com/rbong/vim-flog/"; }; - vim-flutter = buildVimPluginFrom2Nix { + vim-flutter = buildVimPlugin { pname = "vim-flutter"; version = "2023-06-07"; src = fetchFromGitHub { @@ -12043,7 +12067,7 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPluginFrom2Nix { + vim-fsharp = buildVimPlugin { pname = "vim-fsharp"; version = "2018-11-13"; src = fetchFromGitHub { @@ -12055,7 +12079,7 @@ final: prev: meta.homepage = "https://github.com/fsharp/vim-fsharp/"; }; - vim-ft-diff_fold = buildVimPluginFrom2Nix { + vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; src = fetchFromGitHub { @@ -12067,7 +12091,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; }; - vim-fubitive = buildVimPluginFrom2Nix { + vim-fubitive = buildVimPlugin { pname = "vim-fubitive"; version = "2023-08-16"; src = fetchFromGitHub { @@ -12079,19 +12103,19 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; - vim-fugitive = buildVimPluginFrom2Nix { + vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2023-09-08"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "6fcb0ad03982de646e3fecb6915e585651b9a9fb"; - sha256 = "1acl8akxdgpanyn56y4lyvgljrhf2dlrdhisl924l9r0zba0kc3i"; + rev = "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1"; + sha256 = "0jq91xc9m5i60gp1wvm9226q4wq393067v2kqsz0vfsclik650x6"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; - vim-fzf-coauthorship = buildVimPluginFrom2Nix { + vim-fzf-coauthorship = buildVimPlugin { pname = "vim-fzf-coauthorship"; version = "2021-07-14"; src = fetchFromGitHub { @@ -12103,7 +12127,7 @@ final: prev: meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/"; }; - vim-gas = buildVimPluginFrom2Nix { + vim-gas = buildVimPlugin { pname = "vim-gas"; version = "2022-03-07"; src = fetchFromGitHub { @@ -12115,7 +12139,7 @@ final: prev: meta.homepage = "https://github.com/Shirk/vim-gas/"; }; - vim-gh-line = buildVimPluginFrom2Nix { + vim-gh-line = buildVimPlugin { pname = "vim-gh-line"; version = "2022-11-25"; src = fetchFromGitHub { @@ -12127,7 +12151,7 @@ final: prev: meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; - vim-ghost = buildVimPluginFrom2Nix { + vim-ghost = buildVimPlugin { pname = "vim-ghost"; version = "2021-09-26"; src = fetchFromGitHub { @@ -12139,7 +12163,7 @@ final: prev: meta.homepage = "https://github.com/raghur/vim-ghost/"; }; - vim-gist = buildVimPluginFrom2Nix { + vim-gist = buildVimPlugin { pname = "vim-gist"; version = "2022-10-09"; src = fetchFromGitHub { @@ -12151,7 +12175,7 @@ final: prev: meta.homepage = "https://github.com/mattn/vim-gist/"; }; - vim-gista = buildVimPluginFrom2Nix { + vim-gista = buildVimPlugin { pname = "vim-gista"; version = "2020-09-19"; src = fetchFromGitHub { @@ -12163,7 +12187,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; - vim-git = buildVimPluginFrom2Nix { + vim-git = buildVimPlugin { pname = "vim-git"; version = "2023-03-26"; src = fetchFromGitHub { @@ -12175,7 +12199,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-git/"; }; - vim-gitbranch = buildVimPluginFrom2Nix { + vim-gitbranch = buildVimPlugin { pname = "vim-gitbranch"; version = "2021-08-20"; src = fetchFromGitHub { @@ -12187,7 +12211,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/vim-gitbranch/"; }; - vim-gitgutter = buildVimPluginFrom2Nix { + vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; version = "2023-09-01"; src = fetchFromGitHub { @@ -12199,7 +12223,7 @@ final: prev: meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; - vim-github-dashboard = buildVimPluginFrom2Nix { + vim-github-dashboard = buildVimPlugin { pname = "vim-github-dashboard"; version = "2022-01-27"; src = fetchFromGitHub { @@ -12211,7 +12235,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; - vim-glsl = buildVimPluginFrom2Nix { + vim-glsl = buildVimPlugin { pname = "vim-glsl"; version = "2022-05-10"; src = fetchFromGitHub { @@ -12223,7 +12247,7 @@ final: prev: meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; - vim-gnupg = buildVimPluginFrom2Nix { + vim-gnupg = buildVimPlugin { pname = "vim-gnupg"; version = "2022-05-19"; src = fetchFromGitHub { @@ -12235,19 +12259,19 @@ final: prev: meta.homepage = "https://github.com/jamessan/vim-gnupg/"; }; - vim-go = buildVimPluginFrom2Nix { + vim-go = buildVimPlugin { pname = "vim-go"; - version = "2023-09-04"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a2e59981a2d965bed9f4052fa15a08d2ee2f8040"; - sha256 = "0wa6s45lkcphamkhgjlxmryx9wqgi6qzri0mqymkpzcsplgyqc9w"; + rev = "1401b576c6ac382529188d3d26cff866139f2f9a"; + sha256 = "1i6k7i3dqzx825vhp1y2i7ca1i0y8bclkj13vnwws6drw3q9gbrg"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; - vim-grammarous = buildVimPluginFrom2Nix { + vim-grammarous = buildVimPlugin { pname = "vim-grammarous"; version = "2020-11-30"; src = fetchFromGitHub { @@ -12259,7 +12283,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; - vim-graphql = buildVimPluginFrom2Nix { + vim-graphql = buildVimPlugin { pname = "vim-graphql"; version = "2023-09-11"; src = fetchFromGitHub { @@ -12271,7 +12295,7 @@ final: prev: meta.homepage = "https://github.com/jparise/vim-graphql/"; }; - vim-grepper = buildVimPluginFrom2Nix { + vim-grepper = buildVimPlugin { pname = "vim-grepper"; version = "2021-08-30"; src = fetchFromGitHub { @@ -12283,7 +12307,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; - vim-gruvbox8 = buildVimPluginFrom2Nix { + vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; version = "2023-08-04"; src = fetchFromGitHub { @@ -12295,7 +12319,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; - vim-gui-position = buildVimPluginFrom2Nix { + vim-gui-position = buildVimPlugin { pname = "vim-gui-position"; version = "2019-06-06"; src = fetchFromGitHub { @@ -12307,7 +12331,7 @@ final: prev: meta.homepage = "https://github.com/brennanfee/vim-gui-position/"; }; - vim-gutentags = buildVimPluginFrom2Nix { + vim-gutentags = buildVimPlugin { pname = "vim-gutentags"; version = "2023-04-14"; src = fetchFromGitHub { @@ -12319,7 +12343,7 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; - vim-hardtime = buildVimPluginFrom2Nix { + vim-hardtime = buildVimPlugin { pname = "vim-hardtime"; version = "2022-05-06"; src = fetchFromGitHub { @@ -12331,7 +12355,7 @@ final: prev: meta.homepage = "https://github.com/takac/vim-hardtime/"; }; - vim-haskell-module-name = buildVimPluginFrom2Nix { + vim-haskell-module-name = buildVimPlugin { pname = "vim-haskell-module-name"; version = "2020-01-20"; src = fetchFromGitHub { @@ -12343,7 +12367,7 @@ final: prev: meta.homepage = "https://github.com/chkno/vim-haskell-module-name/"; }; - vim-haskellConcealPlus = buildVimPluginFrom2Nix { + vim-haskellConcealPlus = buildVimPlugin { pname = "vim-haskellConcealPlus"; version = "2020-01-21"; src = fetchFromGitHub { @@ -12355,7 +12379,7 @@ final: prev: meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; }; - vim-haskellconceal = buildVimPluginFrom2Nix { + vim-haskellconceal = buildVimPlugin { pname = "vim-haskellconceal"; version = "2017-06-15"; src = fetchFromGitHub { @@ -12367,7 +12391,7 @@ final: prev: meta.homepage = "https://github.com/twinside/vim-haskellconceal/"; }; - vim-hcl = buildVimPluginFrom2Nix { + vim-hcl = buildVimPlugin { pname = "vim-hcl"; version = "2022-02-25"; src = fetchFromGitHub { @@ -12379,7 +12403,7 @@ final: prev: meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; - vim-hdevtools = buildVimPluginFrom2Nix { + vim-hdevtools = buildVimPlugin { pname = "vim-hdevtools"; version = "2018-11-19"; src = fetchFromGitHub { @@ -12391,7 +12415,7 @@ final: prev: meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; - vim-helm = buildVimPluginFrom2Nix { + vim-helm = buildVimPlugin { pname = "vim-helm"; version = "2022-08-22"; src = fetchFromGitHub { @@ -12403,7 +12427,7 @@ final: prev: meta.homepage = "https://github.com/towolf/vim-helm/"; }; - vim-hexokinase = buildVimPluginFrom2Nix { + vim-hexokinase = buildVimPlugin { pname = "vim-hexokinase"; version = "2021-04-25"; src = fetchFromGitHub { @@ -12416,7 +12440,7 @@ final: prev: meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; }; - vim-hier = buildVimPluginFrom2Nix { + vim-hier = buildVimPlugin { pname = "vim-hier"; version = "2011-08-27"; src = fetchFromGitHub { @@ -12428,7 +12452,7 @@ final: prev: meta.homepage = "https://github.com/jceb/vim-hier/"; }; - vim-highlightedyank = buildVimPluginFrom2Nix { + vim-highlightedyank = buildVimPlugin { pname = "vim-highlightedyank"; version = "2023-03-19"; src = fetchFromGitHub { @@ -12440,7 +12464,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; - vim-hindent = buildVimPluginFrom2Nix { + vim-hindent = buildVimPlugin { pname = "vim-hindent"; version = "2018-07-31"; src = fetchFromGitHub { @@ -12452,7 +12476,7 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-hindent/"; }; - vim-hocon = buildVimPluginFrom2Nix { + vim-hocon = buildVimPlugin { pname = "vim-hocon"; version = "2017-09-08"; src = fetchFromGitHub { @@ -12464,7 +12488,7 @@ final: prev: meta.homepage = "https://github.com/GEverding/vim-hocon/"; }; - vim-hoogle = buildVimPluginFrom2Nix { + vim-hoogle = buildVimPlugin { pname = "vim-hoogle"; version = "2018-03-04"; src = fetchFromGitHub { @@ -12476,7 +12500,7 @@ final: prev: meta.homepage = "https://github.com/Twinside/vim-hoogle/"; }; - vim-horizon = buildVimPluginFrom2Nix { + vim-horizon = buildVimPlugin { pname = "vim-horizon"; version = "2023-03-17"; src = fetchFromGitHub { @@ -12488,7 +12512,7 @@ final: prev: meta.homepage = "https://github.com/ntk148v/vim-horizon/"; }; - vim-html-template-literals = buildVimPluginFrom2Nix { + vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; version = "2021-06-03"; src = fetchFromGitHub { @@ -12500,7 +12524,7 @@ final: prev: meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; - vim-husk = buildVimPluginFrom2Nix { + vim-husk = buildVimPlugin { pname = "vim-husk"; version = "2015-11-29"; src = fetchFromGitHub { @@ -12512,7 +12536,7 @@ final: prev: meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; - vim-hybrid = buildVimPluginFrom2Nix { + vim-hybrid = buildVimPlugin { pname = "vim-hybrid"; version = "2016-01-05"; src = fetchFromGitHub { @@ -12524,7 +12548,7 @@ final: prev: meta.homepage = "https://github.com/w0ng/vim-hybrid/"; }; - vim-hybrid-material = buildVimPluginFrom2Nix { + vim-hybrid-material = buildVimPlugin { pname = "vim-hybrid-material"; version = "2020-06-16"; src = fetchFromGitHub { @@ -12536,7 +12560,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; - vim-iced-coffee-script = buildVimPluginFrom2Nix { + vim-iced-coffee-script = buildVimPlugin { pname = "vim-iced-coffee-script"; version = "2013-12-26"; src = fetchFromGitHub { @@ -12548,19 +12572,19 @@ final: prev: meta.homepage = "https://github.com/noc7c9/vim-iced-coffee-script/"; }; - vim-illuminate = buildVimPluginFrom2Nix { + vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2023-09-12"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "8c910b2f84ae6acd9b4b17330bb94dd783c0c11a"; - sha256 = "0v6w5lm8f39yg9s3lfh15a2sbw8sr6pfiz6p83fmigrxncvb49cp"; + rev = "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86"; + sha256 = "0x3li63dijw9z4imbajpxbrclw32649810bsnx5cawrqgbc7kl99"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; - vim-indent-guides = buildVimPluginFrom2Nix { + vim-indent-guides = buildVimPlugin { pname = "vim-indent-guides"; version = "2023-03-18"; src = fetchFromGitHub { @@ -12572,7 +12596,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-indent-guides/"; }; - vim-indent-object = buildVimPluginFrom2Nix { + vim-indent-object = buildVimPlugin { pname = "vim-indent-object"; version = "2018-04-08"; src = fetchFromGitHub { @@ -12584,7 +12608,7 @@ final: prev: meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/"; }; - vim-indentwise = buildVimPluginFrom2Nix { + vim-indentwise = buildVimPlugin { pname = "vim-indentwise"; version = "2015-06-07"; src = fetchFromGitHub { @@ -12596,7 +12620,7 @@ final: prev: meta.homepage = "https://github.com/jeetsukumaran/vim-indentwise/"; }; - vim-indexed-search = buildVimPluginFrom2Nix { + vim-indexed-search = buildVimPlugin { pname = "vim-indexed-search"; version = "2021-12-13"; src = fetchFromGitHub { @@ -12608,7 +12632,7 @@ final: prev: meta.homepage = "https://github.com/henrik/vim-indexed-search/"; }; - vim-ipython = buildVimPluginFrom2Nix { + vim-ipython = buildVimPlugin { pname = "vim-ipython"; version = "2015-06-23"; src = fetchFromGitHub { @@ -12620,7 +12644,7 @@ final: prev: meta.homepage = "https://github.com/ivanov/vim-ipython/"; }; - vim-isort = buildVimPluginFrom2Nix { + vim-isort = buildVimPlugin { pname = "vim-isort"; version = "2023-07-12"; src = fetchFromGitHub { @@ -12632,7 +12656,7 @@ final: prev: meta.homepage = "https://github.com/fisadev/vim-isort/"; }; - vim-jack-in = buildVimPluginFrom2Nix { + vim-jack-in = buildVimPlugin { pname = "vim-jack-in"; version = "2023-04-17"; src = fetchFromGitHub { @@ -12644,7 +12668,7 @@ final: prev: meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; - vim-janah = buildVimPluginFrom2Nix { + vim-janah = buildVimPlugin { pname = "vim-janah"; version = "2018-10-01"; src = fetchFromGitHub { @@ -12656,7 +12680,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-janah/"; }; - vim-javacomplete2 = buildVimPluginFrom2Nix { + vim-javacomplete2 = buildVimPlugin { pname = "vim-javacomplete2"; version = "2022-06-05"; src = fetchFromGitHub { @@ -12668,7 +12692,7 @@ final: prev: meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; - vim-javascript = buildVimPluginFrom2Nix { + vim-javascript = buildVimPlugin { pname = "vim-javascript"; version = "2022-08-15"; src = fetchFromGitHub { @@ -12680,7 +12704,7 @@ final: prev: meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; - vim-javascript-syntax = buildVimPluginFrom2Nix { + vim-javascript-syntax = buildVimPlugin { pname = "vim-javascript-syntax"; version = "2020-09-27"; src = fetchFromGitHub { @@ -12692,7 +12716,7 @@ final: prev: meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; - vim-jinja = buildVimPluginFrom2Nix { + vim-jinja = buildVimPlugin { pname = "vim-jinja"; version = "2021-08-26"; src = fetchFromGitHub { @@ -12704,7 +12728,7 @@ final: prev: meta.homepage = "https://github.com/lepture/vim-jinja/"; }; - vim-jinja-languages = buildVimPluginFrom2Nix { + vim-jinja-languages = buildVimPlugin { pname = "vim-jinja-languages"; version = "2022-04-04"; src = fetchFromGitHub { @@ -12716,7 +12740,7 @@ final: prev: meta.homepage = "https://github.com/seirl/vim-jinja-languages/"; }; - vim-jsbeautify = buildVimPluginFrom2Nix { + vim-jsbeautify = buildVimPlugin { pname = "vim-jsbeautify"; version = "2020-12-11"; src = fetchFromGitHub { @@ -12729,7 +12753,7 @@ final: prev: meta.homepage = "https://github.com/maksimr/vim-jsbeautify/"; }; - vim-jsdoc = buildVimPluginFrom2Nix { + vim-jsdoc = buildVimPlugin { pname = "vim-jsdoc"; version = "2023-05-23"; src = fetchFromGitHub { @@ -12741,7 +12765,7 @@ final: prev: meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; - vim-json = buildVimPluginFrom2Nix { + vim-json = buildVimPlugin { pname = "vim-json"; version = "2018-01-10"; src = fetchFromGitHub { @@ -12753,7 +12777,7 @@ final: prev: meta.homepage = "https://github.com/elzr/vim-json/"; }; - vim-jsonnet = buildVimPluginFrom2Nix { + vim-jsonnet = buildVimPlugin { pname = "vim-jsonnet"; version = "2023-02-20"; src = fetchFromGitHub { @@ -12765,7 +12789,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-jsonnet/"; }; - vim-jsonpath = buildVimPluginFrom2Nix { + vim-jsonpath = buildVimPlugin { pname = "vim-jsonpath"; version = "2020-06-16"; src = fetchFromGitHub { @@ -12777,7 +12801,7 @@ final: prev: meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/"; }; - vim-jsx-pretty = buildVimPluginFrom2Nix { + vim-jsx-pretty = buildVimPlugin { pname = "vim-jsx-pretty"; version = "2021-01-12"; src = fetchFromGitHub { @@ -12789,7 +12813,7 @@ final: prev: meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; - vim-jsx-typescript = buildVimPluginFrom2Nix { + vim-jsx-typescript = buildVimPlugin { pname = "vim-jsx-typescript"; version = "2020-12-03"; src = fetchFromGitHub { @@ -12801,7 +12825,7 @@ final: prev: meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; - vim-julia-cell = buildVimPluginFrom2Nix { + vim-julia-cell = buildVimPlugin { pname = "vim-julia-cell"; version = "2020-08-04"; src = fetchFromGitHub { @@ -12813,19 +12837,19 @@ final: prev: meta.homepage = "https://github.com/mroavi/vim-julia-cell/"; }; - vim-just = buildVimPluginFrom2Nix { + vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-08-02"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "927b41825b9cd07a40fc15b4c68635c4b36fa923"; - sha256 = "11j6l136rskm19p19mjxvws5yp99s3d5h7mg3wq3mka18mcmhv06"; + rev = "3038ffac026a13edaf1bbb898f25d808b6b0c92a"; + sha256 = "1dh3jhfvv0vk1khxi3hfy80xnvk021vj3rrlmj3jjgarda06psmv"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; - vim-kitty-navigator = buildVimPluginFrom2Nix { + vim-kitty-navigator = buildVimPlugin { pname = "vim-kitty-navigator"; version = "2023-05-25"; src = fetchFromGitHub { @@ -12837,7 +12861,7 @@ final: prev: meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; - vim-lastplace = buildVimPluginFrom2Nix { + vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; version = "2023-08-24"; src = fetchFromGitHub { @@ -12849,19 +12873,19 @@ final: prev: meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; - vim-latex-live-preview = buildVimPluginFrom2Nix { + vim-latex-live-preview = buildVimPlugin { pname = "vim-latex-live-preview"; - version = "2023-04-01"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "e1a6a31b123bf6b15635cac6d391afcb2670187a"; - sha256 = "163zvzchxmpff2slj769bqagfblq6n7h3gyxn557dfl7hj5bfs2y"; + rev = "e1906cd4930a58ebaa5eb446436df23522eafb51"; + sha256 = "1adfyk96prwbf8dmznnfqvz27jxq0fpjygdhbrcc8b2i93i2dia2"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; - vim-lawrencium = buildVimPluginFrom2Nix { + vim-lawrencium = buildVimPlugin { pname = "vim-lawrencium"; version = "2022-01-19"; src = fetchFromGitHub { @@ -12873,7 +12897,7 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; - vim-leader-guide = buildVimPluginFrom2Nix { + vim-leader-guide = buildVimPlugin { pname = "vim-leader-guide"; version = "2018-10-06"; src = fetchFromGitHub { @@ -12885,7 +12909,7 @@ final: prev: meta.homepage = "https://github.com/hecal3/vim-leader-guide/"; }; - vim-lean = buildVimPluginFrom2Nix { + vim-lean = buildVimPlugin { pname = "vim-lean"; version = "2017-07-29"; src = fetchFromGitHub { @@ -12897,7 +12921,7 @@ final: prev: meta.homepage = "https://github.com/mk12/vim-lean/"; }; - vim-ledger = buildVimPluginFrom2Nix { + vim-ledger = buildVimPlugin { pname = "vim-ledger"; version = "2023-02-23"; src = fetchFromGitHub { @@ -12909,7 +12933,7 @@ final: prev: meta.homepage = "https://github.com/ledger/vim-ledger/"; }; - vim-lexical = buildVimPluginFrom2Nix { + vim-lexical = buildVimPlugin { pname = "vim-lexical"; version = "2022-02-11"; src = fetchFromGitHub { @@ -12921,7 +12945,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-lexical/"; }; - vim-lfe = buildVimPluginFrom2Nix { + vim-lfe = buildVimPlugin { pname = "vim-lfe"; version = "2018-04-30"; src = fetchFromGitHub { @@ -12933,7 +12957,7 @@ final: prev: meta.homepage = "https://github.com/lfe-support/vim-lfe/"; }; - vim-lightline-coc = buildVimPluginFrom2Nix { + vim-lightline-coc = buildVimPlugin { pname = "vim-lightline-coc"; version = "2021-03-03"; src = fetchFromGitHub { @@ -12945,7 +12969,7 @@ final: prev: meta.homepage = "https://github.com/josa42/vim-lightline-coc/"; }; - vim-lion = buildVimPluginFrom2Nix { + vim-lion = buildVimPlugin { pname = "vim-lion"; version = "2020-07-18"; src = fetchFromGitHub { @@ -12957,7 +12981,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-lion/"; }; - vim-liquid = buildVimPluginFrom2Nix { + vim-liquid = buildVimPlugin { pname = "vim-liquid"; version = "2021-11-28"; src = fetchFromGitHub { @@ -12969,7 +12993,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-liquid/"; }; - vim-llvm = buildVimPluginFrom2Nix { + vim-llvm = buildVimPlugin { pname = "vim-llvm"; version = "2023-05-31"; src = fetchFromGitHub { @@ -12981,7 +13005,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; - vim-localvimrc = buildVimPluginFrom2Nix { + vim-localvimrc = buildVimPlugin { pname = "vim-localvimrc"; version = "2023-06-08"; src = fetchFromGitHub { @@ -12993,7 +13017,7 @@ final: prev: meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; - vim-logreview = buildVimPluginFrom2Nix { + vim-logreview = buildVimPlugin { pname = "vim-logreview"; version = "2022-02-28"; src = fetchFromGitHub { @@ -13005,7 +13029,7 @@ final: prev: meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; - vim-loves-dafny = buildVimPluginFrom2Nix { + vim-loves-dafny = buildVimPlugin { pname = "vim-loves-dafny"; version = "2018-09-25"; src = fetchFromGitHub { @@ -13017,7 +13041,7 @@ final: prev: meta.homepage = "https://github.com/mlr-msft/vim-loves-dafny/"; }; - vim-lsc = buildVimPluginFrom2Nix { + vim-lsc = buildVimPlugin { pname = "vim-lsc"; version = "2023-08-04"; src = fetchFromGitHub { @@ -13029,19 +13053,19 @@ final: prev: meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; - vim-lsp = buildVimPluginFrom2Nix { + vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-09-09"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7233bb2ec07506b6a6e57dfe4541f1c4e5647fd2"; - sha256 = "0h0qg61zixfl26czgaxklx7hdkkia2cc83xvv80ipyr1rva2crwh"; + rev = "c58edb98f09a650612adaaf8c47995c9e2b7ffb1"; + sha256 = "0y839rrk5i3f6wmk94p28yy3alq5jnh8124v51prmzirzyhirhh1"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; - vim-lsp-ale = buildVimPluginFrom2Nix { + vim-lsp-ale = buildVimPlugin { pname = "vim-lsp-ale"; version = "2021-12-28"; src = fetchFromGitHub { @@ -13053,7 +13077,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-lsp-ale/"; }; - vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { + vim-lsp-cxx-highlight = buildVimPlugin { pname = "vim-lsp-cxx-highlight"; version = "2021-10-20"; src = fetchFromGitHub { @@ -13065,19 +13089,19 @@ final: prev: meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; - vim-lsp-settings = buildVimPluginFrom2Nix { + vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2023-09-03"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "7344e006d06070a7e3f09655de552040a26a49c9"; - sha256 = "0v76sp0v5h4i41hda62rnqxvxc55wd9mnk2idnnp2p67xkb41pvy"; + rev = "7613a3f702ae7ff2794b659a9769494203f5cb67"; + sha256 = "0fa56dn9jmqz0hwd2jjc9g4j0rqyw5d5v64vzs8lq6r52fvzcm6j"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; - vim-lsp-snippets = buildVimPluginFrom2Nix { + vim-lsp-snippets = buildVimPlugin { pname = "vim-lsp-snippets"; version = "2020-01-15"; src = fetchFromGitHub { @@ -13089,7 +13113,7 @@ final: prev: meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-snippets/"; }; - vim-lsp-ultisnips = buildVimPluginFrom2Nix { + vim-lsp-ultisnips = buildVimPlugin { pname = "vim-lsp-ultisnips"; version = "2023-04-07"; src = fetchFromGitHub { @@ -13101,7 +13125,7 @@ final: prev: meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-ultisnips/"; }; - vim-lua = buildVimPluginFrom2Nix { + vim-lua = buildVimPlugin { pname = "vim-lua"; version = "2020-08-05"; src = fetchFromGitHub { @@ -13113,7 +13137,7 @@ final: prev: meta.homepage = "https://github.com/tbastos/vim-lua/"; }; - vim-maktaba = buildVimPluginFrom2Nix { + vim-maktaba = buildVimPlugin { pname = "vim-maktaba"; version = "2023-03-21"; src = fetchFromGitHub { @@ -13125,7 +13149,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-maktaba/"; }; - vim-manpager = buildVimPluginFrom2Nix { + vim-manpager = buildVimPlugin { pname = "vim-manpager"; version = "2022-07-23"; src = fetchFromGitHub { @@ -13137,7 +13161,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; - vim-markbar = buildVimPluginFrom2Nix { + vim-markbar = buildVimPlugin { pname = "vim-markbar"; version = "2023-08-24"; src = fetchFromGitHub { @@ -13149,19 +13173,19 @@ final: prev: meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; - vim-markdown = buildVimPluginFrom2Nix { + vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2023-04-08"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "cc82d88e2a791f54d2b6e2b26e41f743351ac947"; - sha256 = "1l3vdx87sgqbxbh1jz00xm8s589rca4pszqk4jj9yvn1vxljnk87"; + rev = "4e9b4deda11d05a157ab34e97f76089669b5b7af"; + sha256 = "027i9y3f0dh6m3fw4fr7jd3pichbs9004c5hqm4i2fz82vb35smm"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; - vim-markdown-composer = buildVimPluginFrom2Nix { + vim-markdown-composer = buildVimPlugin { pname = "vim-markdown-composer"; version = "2022-06-14"; src = fetchFromGitHub { @@ -13174,7 +13198,7 @@ final: prev: meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; }; - vim-markdown-toc = buildVimPluginFrom2Nix { + vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; version = "2022-08-29"; src = fetchFromGitHub { @@ -13186,7 +13210,7 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; - vim-matchup = buildVimPluginFrom2Nix { + vim-matchup = buildVimPlugin { pname = "vim-matchup"; version = "2023-09-02"; src = fetchFromGitHub { @@ -13198,7 +13222,7 @@ final: prev: meta.homepage = "https://github.com/andymass/vim-matchup/"; }; - vim-mediawiki-editor = buildVimPluginFrom2Nix { + vim-mediawiki-editor = buildVimPlugin { pname = "vim-mediawiki-editor"; version = "2022-10-29"; src = fetchFromGitHub { @@ -13210,7 +13234,7 @@ final: prev: meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/"; }; - vim-mergetool = buildVimPluginFrom2Nix { + vim-mergetool = buildVimPlugin { pname = "vim-mergetool"; version = "2019-06-22"; src = fetchFromGitHub { @@ -13222,7 +13246,7 @@ final: prev: meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; - vim-merginal = buildVimPluginFrom2Nix { + vim-merginal = buildVimPlugin { pname = "vim-merginal"; version = "2023-08-27"; src = fetchFromGitHub { @@ -13234,7 +13258,7 @@ final: prev: meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; - vim-metamath = buildVimPluginFrom2Nix { + vim-metamath = buildVimPlugin { pname = "vim-metamath"; version = "2017-02-10"; src = fetchFromGitHub { @@ -13246,7 +13270,7 @@ final: prev: meta.homepage = "https://github.com/david-a-wheeler/vim-metamath/"; }; - vim-misc = buildVimPluginFrom2Nix { + vim-misc = buildVimPlugin { pname = "vim-misc"; version = "2015-05-21"; src = fetchFromGitHub { @@ -13258,7 +13282,7 @@ final: prev: meta.homepage = "https://github.com/xolox/vim-misc/"; }; - vim-molokai-delroth = buildVimPluginFrom2Nix { + vim-molokai-delroth = buildVimPlugin { pname = "vim-molokai-delroth"; version = "2023-05-30"; src = fetchFromGitHub { @@ -13270,7 +13294,7 @@ final: prev: meta.homepage = "https://github.com/delroth/vim-molokai-delroth/"; }; - vim-monokai = buildVimPluginFrom2Nix { + vim-monokai = buildVimPlugin { pname = "vim-monokai"; version = "2022-12-09"; src = fetchFromGitHub { @@ -13282,7 +13306,7 @@ final: prev: meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; - vim-monokai-pro = buildVimPluginFrom2Nix { + vim-monokai-pro = buildVimPlugin { pname = "vim-monokai-pro"; version = "2022-06-25"; src = fetchFromGitHub { @@ -13294,31 +13318,31 @@ final: prev: meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; - vim-monokai-tasty = buildVimPluginFrom2Nix { + vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2023-09-12"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "c112e2d574dc6f1122a919d595f9b0d3bc5dc3ec"; - sha256 = "1q28hqbybdpqwx0i5w5zywxalyf31ljjqi9ym4z5w91qsqx6xp08"; + rev = "f1885575df9c0ed00c49544e213672d3a8da59ad"; + sha256 = "12xmkhw8rwl47zyqych1iml6nrrak57ckxiaas5nwybnygv5n36x"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; - vim-move = buildVimPluginFrom2Nix { + vim-move = buildVimPlugin { pname = "vim-move"; - version = "2023-05-11"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "244a2908ffbca3d09529b3ec24c2c090f489f401"; - sha256 = "1kd0bwzmsa8c6imr69a5z5dk5hm2ipnf1wf5j0wd4sz4yfjxzfa3"; + rev = "3c4195de0748da9bba25c54d78d959d349e93c55"; + sha256 = "021xv4q95ib9fhm0c7pzrpx56n66kq3n3nkyy57k59b1ryf6bigm"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; - vim-mucomplete = buildVimPluginFrom2Nix { + vim-mucomplete = buildVimPlugin { pname = "vim-mucomplete"; version = "2022-09-28"; src = fetchFromGitHub { @@ -13330,7 +13354,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; - vim-multiple-cursors = buildVimPluginFrom2Nix { + vim-multiple-cursors = buildVimPlugin { pname = "vim-multiple-cursors"; version = "2020-07-30"; src = fetchFromGitHub { @@ -13342,7 +13366,7 @@ final: prev: meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; - vim-mundo = buildVimPluginFrom2Nix { + vim-mundo = buildVimPlugin { pname = "vim-mundo"; version = "2022-11-05"; src = fetchFromGitHub { @@ -13354,7 +13378,7 @@ final: prev: meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; - vim-mustache-handlebars = buildVimPluginFrom2Nix { + vim-mustache-handlebars = buildVimPlugin { pname = "vim-mustache-handlebars"; version = "2021-11-30"; src = fetchFromGitHub { @@ -13366,7 +13390,7 @@ final: prev: meta.homepage = "https://github.com/mustache/vim-mustache-handlebars/"; }; - vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + vim-nerdtree-syntax-highlight = buildVimPlugin { pname = "vim-nerdtree-syntax-highlight"; version = "2023-07-07"; src = fetchFromGitHub { @@ -13378,7 +13402,7 @@ final: prev: meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; - vim-nerdtree-tabs = buildVimPluginFrom2Nix { + vim-nerdtree-tabs = buildVimPlugin { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; src = fetchFromGitHub { @@ -13390,7 +13414,7 @@ final: prev: meta.homepage = "https://github.com/jistr/vim-nerdtree-tabs/"; }; - vim-nftables = buildVimPluginFrom2Nix { + vim-nftables = buildVimPlugin { pname = "vim-nftables"; version = "2020-06-29"; src = fetchFromGitHub { @@ -13402,7 +13426,7 @@ final: prev: meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; - vim-niceblock = buildVimPluginFrom2Nix { + vim-niceblock = buildVimPlugin { pname = "vim-niceblock"; version = "2018-09-06"; src = fetchFromGitHub { @@ -13414,19 +13438,19 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; - vim-nickel = buildVimPluginFrom2Nix { + vim-nickel = buildVimPlugin { pname = "vim-nickel"; - version = "2023-07-05"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "vim-nickel"; - rev = "535196c1e6b77e05f31a5ba50a5eaef393bbf280"; - sha256 = "042n288b6c58jihbgsxhilycx56llbqck341zw7gf8sk4sypqhhr"; + rev = "f22898d88affc0958453b42e1147ba076637e0ed"; + sha256 = "1yczwjs3svan4hmsmb3lzn3i2n50qfkmkncqyrvsy5qyrlv19gy1"; }; meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; }; - vim-ninja-feet = buildVimPluginFrom2Nix { + vim-ninja-feet = buildVimPlugin { pname = "vim-ninja-feet"; version = "2021-05-27"; src = fetchFromGitHub { @@ -13438,7 +13462,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; - vim-nix = buildVimPluginFrom2Nix { + vim-nix = buildVimPlugin { pname = "vim-nix"; version = "2023-07-29"; src = fetchFromGitHub { @@ -13450,7 +13474,7 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; - vim-nixhash = buildVimPluginFrom2Nix { + vim-nixhash = buildVimPlugin { pname = "vim-nixhash"; version = "2023-01-09"; src = fetchFromGitHub { @@ -13462,7 +13486,7 @@ final: prev: meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; - vim-noctu = buildVimPluginFrom2Nix { + vim-noctu = buildVimPlugin { pname = "vim-noctu"; version = "2015-06-27"; src = fetchFromGitHub { @@ -13474,7 +13498,7 @@ final: prev: meta.homepage = "https://github.com/noahfrederick/vim-noctu/"; }; - vim-nong-theme = buildVimPluginFrom2Nix { + vim-nong-theme = buildVimPlugin { pname = "vim-nong-theme"; version = "2020-12-16"; src = fetchFromGitHub { @@ -13486,7 +13510,7 @@ final: prev: meta.homepage = "https://github.com/fruit-in/vim-nong-theme/"; }; - vim-numbertoggle = buildVimPluginFrom2Nix { + vim-numbertoggle = buildVimPlugin { pname = "vim-numbertoggle"; version = "2021-07-14"; src = fetchFromGitHub { @@ -13498,7 +13522,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; }; - vim-obsession = buildVimPluginFrom2Nix { + vim-obsession = buildVimPlugin { pname = "vim-obsession"; version = "2022-12-02"; src = fetchFromGitHub { @@ -13510,7 +13534,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-obsession/"; }; - vim-ocaml = buildVimPluginFrom2Nix { + vim-ocaml = buildVimPlugin { pname = "vim-ocaml"; version = "2023-07-04"; src = fetchFromGitHub { @@ -13522,7 +13546,7 @@ final: prev: meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; - vim-one = buildVimPluginFrom2Nix { + vim-one = buildVimPlugin { pname = "vim-one"; version = "2020-12-14"; src = fetchFromGitHub { @@ -13534,7 +13558,7 @@ final: prev: meta.homepage = "https://github.com/rakr/vim-one/"; }; - vim-opencl = buildVimPluginFrom2Nix { + vim-opencl = buildVimPlugin { pname = "vim-opencl"; version = "2018-06-13"; src = fetchFromGitHub { @@ -13546,7 +13570,7 @@ final: prev: meta.homepage = "https://github.com/petRUShka/vim-opencl/"; }; - vim-openscad = buildVimPluginFrom2Nix { + vim-openscad = buildVimPlugin { pname = "vim-openscad"; version = "2022-07-26"; src = fetchFromGitHub { @@ -13558,7 +13582,7 @@ final: prev: meta.homepage = "https://github.com/sirtaj/vim-openscad/"; }; - vim-operator-replace = buildVimPluginFrom2Nix { + vim-operator-replace = buildVimPlugin { pname = "vim-operator-replace"; version = "2015-02-24"; src = fetchFromGitHub { @@ -13570,7 +13594,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-operator-replace/"; }; - vim-operator-surround = buildVimPluginFrom2Nix { + vim-operator-surround = buildVimPlugin { pname = "vim-operator-surround"; version = "2018-11-01"; src = fetchFromGitHub { @@ -13582,7 +13606,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-operator-surround/"; }; - vim-operator-user = buildVimPluginFrom2Nix { + vim-operator-user = buildVimPlugin { pname = "vim-operator-user"; version = "2015-02-17"; src = fetchFromGitHub { @@ -13594,7 +13618,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-operator-user/"; }; - vim-orgmode = buildVimPluginFrom2Nix { + vim-orgmode = buildVimPlugin { pname = "vim-orgmode"; version = "2022-12-09"; src = fetchFromGitHub { @@ -13606,7 +13630,7 @@ final: prev: meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; - vim-ormolu = buildVimPluginFrom2Nix { + vim-ormolu = buildVimPlugin { pname = "vim-ormolu"; version = "2020-11-25"; src = fetchFromGitHub { @@ -13618,7 +13642,7 @@ final: prev: meta.homepage = "https://github.com/sdiehl/vim-ormolu/"; }; - vim-osc52 = buildVimPluginFrom2Nix { + vim-osc52 = buildVimPlugin { pname = "vim-osc52"; version = "2020-09-19"; src = fetchFromGitHub { @@ -13630,19 +13654,19 @@ final: prev: meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; - vim-oscyank = buildVimPluginFrom2Nix { + vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; - version = "2023-07-01"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "74f5ed963d6dc9dc25db212078300fca6b0a0b4d"; - sha256 = "1j3dyalzy73sckad175y81sifnv65vyhlysxjllbaikafgc0k2sm"; + rev = "7250d51bda669ce1d7f334f2f5e6be012daddcde"; + sha256 = "1ci3z82d20w24vipcpq1z20i6icy7nv7mkdxsk2ly7llr7xwa72w"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; - vim-over = buildVimPluginFrom2Nix { + vim-over = buildVimPlugin { pname = "vim-over"; version = "2020-01-26"; src = fetchFromGitHub { @@ -13654,7 +13678,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-over/"; }; - vim-packer = buildVimPluginFrom2Nix { + vim-packer = buildVimPlugin { pname = "vim-packer"; version = "2018-11-11"; src = fetchFromGitHub { @@ -13666,7 +13690,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-packer/"; }; - vim-pager = buildVimPluginFrom2Nix { + vim-pager = buildVimPlugin { pname = "vim-pager"; version = "2015-08-26"; src = fetchFromGitHub { @@ -13678,7 +13702,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-pager/"; }; - vim-pandoc = buildVimPluginFrom2Nix { + vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; version = "2023-02-24"; src = fetchFromGitHub { @@ -13690,7 +13714,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; - vim-pandoc-after = buildVimPluginFrom2Nix { + vim-pandoc-after = buildVimPlugin { pname = "vim-pandoc-after"; version = "2019-04-29"; src = fetchFromGitHub { @@ -13702,7 +13726,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-after/"; }; - vim-pandoc-syntax = buildVimPluginFrom2Nix { + vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; version = "2023-01-10"; src = fetchFromGitHub { @@ -13714,7 +13738,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; - vim-paper = buildVimPluginFrom2Nix { + vim-paper = buildVimPlugin { pname = "vim-paper"; version = "2023-08-02"; src = fetchFromGitHub { @@ -13726,7 +13750,7 @@ final: prev: meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; }; - vim-parinfer = buildVimPluginFrom2Nix { + vim-parinfer = buildVimPlugin { pname = "vim-parinfer"; version = "2022-11-29"; src = fetchFromGitHub { @@ -13738,7 +13762,7 @@ final: prev: meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; - vim-pasta = buildVimPluginFrom2Nix { + vim-pasta = buildVimPlugin { pname = "vim-pasta"; version = "2023-08-12"; src = fetchFromGitHub { @@ -13750,7 +13774,7 @@ final: prev: meta.homepage = "https://github.com/ku1ik/vim-pasta/"; }; - vim-pathogen = buildVimPluginFrom2Nix { + vim-pathogen = buildVimPlugin { pname = "vim-pathogen"; version = "2022-08-24"; src = fetchFromGitHub { @@ -13762,7 +13786,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-pathogen/"; }; - vim-peekaboo = buildVimPluginFrom2Nix { + vim-peekaboo = buildVimPlugin { pname = "vim-peekaboo"; version = "2019-12-12"; src = fetchFromGitHub { @@ -13774,7 +13798,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-peekaboo/"; }; - vim-pencil = buildVimPluginFrom2Nix { + vim-pencil = buildVimPlugin { pname = "vim-pencil"; version = "2023-04-03"; src = fetchFromGitHub { @@ -13786,7 +13810,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-pencil/"; }; - vim-phabricator = buildVimPluginFrom2Nix { + vim-phabricator = buildVimPlugin { pname = "vim-phabricator"; version = "2021-11-06"; src = fetchFromGitHub { @@ -13798,7 +13822,7 @@ final: prev: meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; - vim-pico8-syntax = buildVimPluginFrom2Nix { + vim-pico8-syntax = buildVimPlugin { pname = "vim-pico8-syntax"; version = "2016-10-30"; src = fetchFromGitHub { @@ -13810,7 +13834,7 @@ final: prev: meta.homepage = "https://github.com/justinj/vim-pico8-syntax/"; }; - vim-plug = buildVimPluginFrom2Nix { + vim-plug = buildVimPlugin { pname = "vim-plug"; version = "2023-04-01"; src = fetchFromGitHub { @@ -13822,7 +13846,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-plug/"; }; - vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { + vim-plugin-AnsiEsc = buildVimPlugin { pname = "vim-plugin-AnsiEsc"; version = "2019-04-07"; src = fetchFromGitHub { @@ -13834,7 +13858,7 @@ final: prev: meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/"; }; - vim-pluto = buildVimPluginFrom2Nix { + vim-pluto = buildVimPlugin { pname = "vim-pluto"; version = "2022-02-01"; src = fetchFromGitHub { @@ -13846,7 +13870,7 @@ final: prev: meta.homepage = "https://github.com/hasundue/vim-pluto/"; }; - vim-polyglot = buildVimPluginFrom2Nix { + vim-polyglot = buildVimPlugin { pname = "vim-polyglot"; version = "2022-10-14"; src = fetchFromGitHub { @@ -13858,19 +13882,7 @@ final: prev: meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; - vim-pony = buildVimPluginFrom2Nix { - pname = "vim-pony"; - version = "2018-07-27"; - src = fetchFromGitHub { - owner = "jakwings"; - repo = "vim-pony"; - rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; - sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; - }; - meta.homepage = "https://github.com/jakwings/vim-pony/"; - }; - - vim-poweryank = buildVimPluginFrom2Nix { + vim-poweryank = buildVimPlugin { pname = "vim-poweryank"; version = "2017-08-13"; src = fetchFromGitHub { @@ -13882,19 +13894,19 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; }; - vim-prettier = buildVimPluginFrom2Nix { + vim-prettier = buildVimPlugin { pname = "vim-prettier"; - version = "2021-11-24"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "prettier"; repo = "vim-prettier"; - rev = "5e6cca21e12587c02e32a06bf423519eb1e9f1b2"; - sha256 = "0sf23h1d15sqcfx1zsscvvczw8bbc7pravfw72mfrf5n6xfiaqal"; + rev = "7dbdbb12c50a9f4ba72390cce2846248e4368fd0"; + sha256 = "1hmb0pq7skqwz722nc36095z9lg3bbqxqdnnjq50wxc2hdfhix75"; }; meta.homepage = "https://github.com/prettier/vim-prettier/"; }; - vim-prettyprint = buildVimPluginFrom2Nix { + vim-prettyprint = buildVimPlugin { pname = "vim-prettyprint"; version = "2016-07-16"; src = fetchFromGitHub { @@ -13906,7 +13918,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-prettyprint/"; }; - vim-printer = buildVimPluginFrom2Nix { + vim-printer = buildVimPlugin { pname = "vim-printer"; version = "2022-03-01"; src = fetchFromGitHub { @@ -13918,7 +13930,7 @@ final: prev: meta.homepage = "https://github.com/meain/vim-printer/"; }; - vim-prisma = buildVimPluginFrom2Nix { + vim-prisma = buildVimPlugin { pname = "vim-prisma"; version = "2023-01-24"; src = fetchFromGitHub { @@ -13930,7 +13942,7 @@ final: prev: meta.homepage = "https://github.com/prisma/vim-prisma/"; }; - vim-projectionist = buildVimPluginFrom2Nix { + vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; version = "2023-03-16"; src = fetchFromGitHub { @@ -13942,7 +13954,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; - vim-prosession = buildVimPluginFrom2Nix { + vim-prosession = buildVimPlugin { pname = "vim-prosession"; version = "2023-08-08"; src = fetchFromGitHub { @@ -13954,7 +13966,7 @@ final: prev: meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; - vim-protobuf = buildVimPluginFrom2Nix { + vim-protobuf = buildVimPlugin { pname = "vim-protobuf"; version = "2017-12-26"; src = fetchFromGitHub { @@ -13966,19 +13978,19 @@ final: prev: meta.homepage = "https://github.com/uarun/vim-protobuf/"; }; - vim-ps1 = buildVimPluginFrom2Nix { + vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2023-01-11"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "502590f90a21f0de2b7664d6d0dcc90e5bb28a9c"; - sha256 = "0v335bgbf1a6ry8dvphfqwmlhlz8x94cj4x6z7ssz16hpasrlhx6"; + rev = "7d0c8581e774cab8198bafa936e231b6f4c634e6"; + sha256 = "07ac71a09qcl1flavkwazd4df6n8v56cqj3phff3f12p5sfkmy1y"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; - vim-pug = buildVimPluginFrom2Nix { + vim-pug = buildVimPlugin { pname = "vim-pug"; version = "2019-09-23"; src = fetchFromGitHub { @@ -13990,7 +14002,7 @@ final: prev: meta.homepage = "https://github.com/digitaltoad/vim-pug/"; }; - vim-puppet = buildVimPluginFrom2Nix { + vim-puppet = buildVimPlugin { pname = "vim-puppet"; version = "2022-05-21"; src = fetchFromGitHub { @@ -14002,7 +14014,7 @@ final: prev: meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; - vim-python-pep8-indent = buildVimPluginFrom2Nix { + vim-python-pep8-indent = buildVimPlugin { pname = "vim-python-pep8-indent"; version = "2020-03-20"; src = fetchFromGitHub { @@ -14014,7 +14026,7 @@ final: prev: meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/"; }; - vim-qf = buildVimPluginFrom2Nix { + vim-qf = buildVimPlugin { pname = "vim-qf"; version = "2023-05-09"; src = fetchFromGitHub { @@ -14026,7 +14038,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qf/"; }; - vim-qlist = buildVimPluginFrom2Nix { + vim-qlist = buildVimPlugin { pname = "vim-qlist"; version = "2019-07-18"; src = fetchFromGitHub { @@ -14038,7 +14050,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qlist/"; }; - vim-qml = buildVimPluginFrom2Nix { + vim-qml = buildVimPlugin { pname = "vim-qml"; version = "2023-09-11"; src = fetchFromGitHub { @@ -14050,7 +14062,7 @@ final: prev: meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; - vim-quickrun = buildVimPluginFrom2Nix { + vim-quickrun = buildVimPlugin { pname = "vim-quickrun"; version = "2022-07-10"; src = fetchFromGitHub { @@ -14062,7 +14074,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; - vim-racer = buildVimPluginFrom2Nix { + vim-racer = buildVimPlugin { pname = "vim-racer"; version = "2021-04-04"; src = fetchFromGitHub { @@ -14074,7 +14086,7 @@ final: prev: meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; - vim-racket = buildVimPluginFrom2Nix { + vim-racket = buildVimPlugin { pname = "vim-racket"; version = "2022-12-30"; src = fetchFromGitHub { @@ -14086,7 +14098,7 @@ final: prev: meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; - vim-ragtag = buildVimPluginFrom2Nix { + vim-ragtag = buildVimPlugin { pname = "vim-ragtag"; version = "2022-03-21"; src = fetchFromGitHub { @@ -14098,7 +14110,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; - vim-rails = buildVimPluginFrom2Nix { + vim-rails = buildVimPlugin { pname = "vim-rails"; version = "2023-09-11"; src = fetchFromGitHub { @@ -14110,7 +14122,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rails/"; }; - vim-reasonml = buildVimPluginFrom2Nix { + vim-reasonml = buildVimPlugin { pname = "vim-reasonml"; version = "2020-07-16"; src = fetchFromGitHub { @@ -14122,7 +14134,7 @@ final: prev: meta.homepage = "https://github.com/jordwalke/vim-reasonml/"; }; - vim-repeat = buildVimPluginFrom2Nix { + vim-repeat = buildVimPlugin { pname = "vim-repeat"; version = "2021-01-25"; src = fetchFromGitHub { @@ -14134,7 +14146,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-repeat/"; }; - vim-rhubarb = buildVimPluginFrom2Nix { + vim-rhubarb = buildVimPlugin { pname = "vim-rhubarb"; version = "2023-03-29"; src = fetchFromGitHub { @@ -14146,7 +14158,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; - vim-rooter = buildVimPluginFrom2Nix { + vim-rooter = buildVimPlugin { pname = "vim-rooter"; version = "2023-09-14"; src = fetchFromGitHub { @@ -14158,7 +14170,7 @@ final: prev: meta.homepage = "https://github.com/airblade/vim-rooter/"; }; - vim-rsi = buildVimPluginFrom2Nix { + vim-rsi = buildVimPlugin { pname = "vim-rsi"; version = "2023-04-30"; src = fetchFromGitHub { @@ -14170,7 +14182,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rsi/"; }; - vim-ruby = buildVimPluginFrom2Nix { + vim-ruby = buildVimPlugin { pname = "vim-ruby"; version = "2023-09-15"; src = fetchFromGitHub { @@ -14182,7 +14194,7 @@ final: prev: meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; - vim-salve = buildVimPluginFrom2Nix { + vim-salve = buildVimPlugin { pname = "vim-salve"; version = "2022-04-15"; src = fetchFromGitHub { @@ -14194,7 +14206,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-salve/"; }; - vim-sandwich = buildVimPluginFrom2Nix { + vim-sandwich = buildVimPlugin { pname = "vim-sandwich"; version = "2022-12-07"; src = fetchFromGitHub { @@ -14206,7 +14218,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; - vim-sayonara = buildVimPluginFrom2Nix { + vim-sayonara = buildVimPlugin { pname = "vim-sayonara"; version = "2021-08-12"; src = fetchFromGitHub { @@ -14218,7 +14230,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-sayonara/"; }; - vim-scala = buildVimPluginFrom2Nix { + vim-scala = buildVimPlugin { pname = "vim-scala"; version = "2021-08-11"; src = fetchFromGitHub { @@ -14230,7 +14242,7 @@ final: prev: meta.homepage = "https://github.com/derekwyatt/vim-scala/"; }; - vim-scouter = buildVimPluginFrom2Nix { + vim-scouter = buildVimPlugin { pname = "vim-scouter"; version = "2014-08-10"; src = fetchFromGitHub { @@ -14242,7 +14254,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-scouter/"; }; - vim-scriptease = buildVimPluginFrom2Nix { + vim-scriptease = buildVimPlugin { pname = "vim-scriptease"; version = "2022-05-30"; src = fetchFromGitHub { @@ -14254,7 +14266,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; - vim-search-pulse = buildVimPluginFrom2Nix { + vim-search-pulse = buildVimPlugin { pname = "vim-search-pulse"; version = "2022-04-26"; src = fetchFromGitHub { @@ -14266,7 +14278,7 @@ final: prev: meta.homepage = "https://github.com/inside/vim-search-pulse/"; }; - vim-sensible = buildVimPluginFrom2Nix { + vim-sensible = buildVimPlugin { pname = "vim-sensible"; version = "2023-03-29"; src = fetchFromGitHub { @@ -14278,7 +14290,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sensible/"; }; - vim-sentence-chopper = buildVimPluginFrom2Nix { + vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; version = "2023-02-15"; src = fetchFromGitHub { @@ -14290,7 +14302,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; }; - vim-sexp = buildVimPluginFrom2Nix { + vim-sexp = buildVimPlugin { pname = "vim-sexp"; version = "2021-03-08"; src = fetchFromGitHub { @@ -14302,7 +14314,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-sexp/"; }; - vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { + vim-sexp-mappings-for-regular-people = buildVimPlugin { pname = "vim-sexp-mappings-for-regular-people"; version = "2022-11-26"; src = fetchFromGitHub { @@ -14314,7 +14326,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; - vim-shellcheck = buildVimPluginFrom2Nix { + vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; version = "2019-07-25"; src = fetchFromGitHub { @@ -14326,7 +14338,7 @@ final: prev: meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; - vim-signature = buildVimPluginFrom2Nix { + vim-signature = buildVimPlugin { pname = "vim-signature"; version = "2018-07-06"; src = fetchFromGitHub { @@ -14338,7 +14350,7 @@ final: prev: meta.homepage = "https://github.com/kshenoy/vim-signature/"; }; - vim-signify = buildVimPluginFrom2Nix { + vim-signify = buildVimPlugin { pname = "vim-signify"; version = "2023-05-10"; src = fetchFromGitHub { @@ -14350,7 +14362,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-signify/"; }; - vim-simpledb = buildVimPluginFrom2Nix { + vim-simpledb = buildVimPlugin { pname = "vim-simpledb"; version = "2020-10-02"; src = fetchFromGitHub { @@ -14362,7 +14374,7 @@ final: prev: meta.homepage = "https://github.com/ivalkeen/vim-simpledb/"; }; - vim-slash = buildVimPluginFrom2Nix { + vim-slash = buildVimPlugin { pname = "vim-slash"; version = "2019-08-28"; src = fetchFromGitHub { @@ -14374,7 +14386,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-slash/"; }; - vim-sleuth = buildVimPluginFrom2Nix { + vim-sleuth = buildVimPlugin { pname = "vim-sleuth"; version = "2023-01-10"; src = fetchFromGitHub { @@ -14386,19 +14398,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; - vim-slime = buildVimPluginFrom2Nix { + vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2023-08-29"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "7cfe5ac9f5d5512a7aeeb2e0a13a64975ac129e5"; - sha256 = "1lzvsdzpmrsdacxy73a6jnji3b3rjq3qm1r3qk4l46291xn8b9cw"; + rev = "c65472ec9a7f5b59b39b8a453e409df28a61f19c"; + sha256 = "0m8ydin934k3x156vwy80lxdih5nqc5lyz9m3vkvwykrksjpln63"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; - vim-smali = buildVimPluginFrom2Nix { + vim-smali = buildVimPlugin { pname = "vim-smali"; version = "2015-11-05"; src = fetchFromGitHub { @@ -14410,7 +14422,7 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-smali/"; }; - vim-smalls = buildVimPluginFrom2Nix { + vim-smalls = buildVimPlugin { pname = "vim-smalls"; version = "2015-05-02"; src = fetchFromGitHub { @@ -14422,7 +14434,7 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-smalls/"; }; - vim-smartbd = buildVimPluginFrom2Nix { + vim-smartbd = buildVimPlugin { pname = "vim-smartbd"; version = "2015-12-20"; src = fetchFromGitHub { @@ -14434,7 +14446,7 @@ final: prev: meta.homepage = "https://github.com/Industrial/vim-smartbd/"; }; - vim-smartbw = buildVimPluginFrom2Nix { + vim-smartbw = buildVimPlugin { pname = "vim-smartbw"; version = "2015-12-20"; src = fetchFromGitHub { @@ -14446,7 +14458,7 @@ final: prev: meta.homepage = "https://github.com/Industrial/vim-smartbw/"; }; - vim-smoothie = buildVimPluginFrom2Nix { + vim-smoothie = buildVimPlugin { pname = "vim-smoothie"; version = "2022-06-10"; src = fetchFromGitHub { @@ -14458,7 +14470,7 @@ final: prev: meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; - vim-smt2 = buildVimPluginFrom2Nix { + vim-smt2 = buildVimPlugin { pname = "vim-smt2"; version = "2023-05-17"; src = fetchFromGitHub { @@ -14470,7 +14482,7 @@ final: prev: meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; - vim-sneak = buildVimPluginFrom2Nix { + vim-sneak = buildVimPlugin { pname = "vim-sneak"; version = "2023-07-12"; src = fetchFromGitHub { @@ -14482,7 +14494,7 @@ final: prev: meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; - vim-snipmate = buildVimPluginFrom2Nix { + vim-snipmate = buildVimPlugin { pname = "vim-snipmate"; version = "2023-03-12"; src = fetchFromGitHub { @@ -14494,7 +14506,7 @@ final: prev: meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; - vim-snippets = buildVimPluginFrom2Nix { + vim-snippets = buildVimPlugin { pname = "vim-snippets"; version = "2023-09-11"; src = fetchFromGitHub { @@ -14506,7 +14518,7 @@ final: prev: meta.homepage = "https://github.com/honza/vim-snippets/"; }; - vim-solarized8 = buildVimPluginFrom2Nix { + vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; version = "2023-08-13"; src = fetchFromGitHub { @@ -14518,7 +14530,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; - vim-solidity = buildVimPluginFrom2Nix { + vim-solidity = buildVimPlugin { pname = "vim-solidity"; version = "2018-04-17"; src = fetchFromGitHub { @@ -14530,7 +14542,7 @@ final: prev: meta.homepage = "https://github.com/tomlion/vim-solidity/"; }; - vim-sort-motion = buildVimPluginFrom2Nix { + vim-sort-motion = buildVimPlugin { pname = "vim-sort-motion"; version = "2021-03-07"; src = fetchFromGitHub { @@ -14542,7 +14554,7 @@ final: prev: meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; - vim-speeddating = buildVimPluginFrom2Nix { + vim-speeddating = buildVimPlugin { pname = "vim-speeddating"; version = "2022-10-10"; src = fetchFromGitHub { @@ -14554,7 +14566,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; - vim-spirv = buildVimPluginFrom2Nix { + vim-spirv = buildVimPlugin { pname = "vim-spirv"; version = "2023-09-16"; src = fetchFromGitHub { @@ -14566,19 +14578,19 @@ final: prev: meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; - vim-startify = buildVimPluginFrom2Nix { + vim-startify = buildVimPlugin { pname = "vim-startify"; - version = "2021-05-08"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "81e36c352a8deea54df5ec1e2f4348685569bed2"; - sha256 = "1y8yi099lqg03781bnma2bj6x5lkvfq65vhdpnm65mfyak6dpzgz"; + rev = "4e089dffdad46f3f5593f34362d530e8fe823dcf"; + sha256 = "1ycqfqnmalqzrx1yy9a1fc2p0w922x4sqv2222bi9xjzmh77z4sv"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; - vim-startuptime = buildVimPluginFrom2Nix { + vim-startuptime = buildVimPlugin { pname = "vim-startuptime"; version = "2023-06-03"; src = fetchFromGitHub { @@ -14590,7 +14602,7 @@ final: prev: meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; - vim-strip-trailing-whitespace = buildVimPluginFrom2Nix { + vim-strip-trailing-whitespace = buildVimPlugin { pname = "vim-strip-trailing-whitespace"; version = "2022-02-01"; src = fetchFromGitHub { @@ -14602,7 +14614,7 @@ final: prev: meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/"; }; - vim-stylish-haskell = buildVimPluginFrom2Nix { + vim-stylish-haskell = buildVimPlugin { pname = "vim-stylish-haskell"; version = "2022-08-08"; src = fetchFromGitHub { @@ -14614,7 +14626,7 @@ final: prev: meta.homepage = "https://github.com/nbouscal/vim-stylish-haskell/"; }; - vim-stylishask = buildVimPluginFrom2Nix { + vim-stylishask = buildVimPlugin { pname = "vim-stylishask"; version = "2021-09-10"; src = fetchFromGitHub { @@ -14626,7 +14638,7 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; - vim-substrata = buildVimPluginFrom2Nix { + vim-substrata = buildVimPlugin { pname = "vim-substrata"; version = "2021-03-23"; src = fetchFromGitHub { @@ -14638,7 +14650,7 @@ final: prev: meta.homepage = "https://github.com/lunacookies/vim-substrata/"; }; - vim-subversive = buildVimPluginFrom2Nix { + vim-subversive = buildVimPlugin { pname = "vim-subversive"; version = "2022-01-26"; src = fetchFromGitHub { @@ -14650,7 +14662,7 @@ final: prev: meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; - vim-surround = buildVimPluginFrom2Nix { + vim-surround = buildVimPlugin { pname = "vim-surround"; version = "2022-10-25"; src = fetchFromGitHub { @@ -14662,7 +14674,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-surround/"; }; - vim-svelte = buildVimPluginFrom2Nix { + vim-svelte = buildVimPlugin { pname = "vim-svelte"; version = "2022-10-27"; src = fetchFromGitHub { @@ -14674,7 +14686,7 @@ final: prev: meta.homepage = "https://github.com/evanleck/vim-svelte/"; }; - vim-swap = buildVimPluginFrom2Nix { + vim-swap = buildVimPlugin { pname = "vim-swap"; version = "2021-08-08"; src = fetchFromGitHub { @@ -14686,7 +14698,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-swap/"; }; - vim-table-mode = buildVimPluginFrom2Nix { + vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; version = "2022-10-20"; src = fetchFromGitHub { @@ -14698,7 +14710,7 @@ final: prev: meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; - vim-tabpagecd = buildVimPluginFrom2Nix { + vim-tabpagecd = buildVimPlugin { pname = "vim-tabpagecd"; version = "2021-09-23"; src = fetchFromGitHub { @@ -14710,7 +14722,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-tabpagecd/"; }; - vim-tbone = buildVimPluginFrom2Nix { + vim-tbone = buildVimPlugin { pname = "vim-tbone"; version = "2023-03-31"; src = fetchFromGitHub { @@ -14722,7 +14734,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-tbone/"; }; - vim-teal = buildVimPluginFrom2Nix { + vim-teal = buildVimPlugin { pname = "vim-teal"; version = "2021-01-05"; src = fetchFromGitHub { @@ -14734,7 +14746,7 @@ final: prev: meta.homepage = "https://github.com/teal-language/vim-teal/"; }; - vim-terminator = buildVimPluginFrom2Nix { + vim-terminator = buildVimPlugin { pname = "vim-terminator"; version = "2022-04-15"; src = fetchFromGitHub { @@ -14746,19 +14758,19 @@ final: prev: meta.homepage = "https://github.com/erietz/vim-terminator/"; }; - vim-terraform = buildVimPluginFrom2Nix { + vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2023-04-26"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "2bbc5f65a80c79a5110494a2ba1b869075fcf7a0"; - sha256 = "0k79q0703ngknrxm4mnhg1qvgkfh2ga7sli6krkx1hd9ikb4p5qp"; + rev = "d37ae7e7828aa167877e338dea5d4e1653ed3eb1"; + sha256 = "0630s7jaadd6ndkkj49k3ivink2vkajh0cjx30dw1ip6md360sjh"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; - vim-terraform-completion = buildVimPluginFrom2Nix { + vim-terraform-completion = buildVimPlugin { pname = "vim-terraform-completion"; version = "2021-04-11"; src = fetchFromGitHub { @@ -14771,19 +14783,19 @@ final: prev: meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/"; }; - vim-test = buildVimPluginFrom2Nix { + vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-09-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "a007258adc7b319943bf71dfead88d2ad721b923"; - sha256 = "0sk2bfk54ds22sri1a3jw4fmn2nw1cr06hlwmclxd8gpaxqv6rmh"; + rev = "53c6c72f3a0c6a24a74e659eaa769d7057ef2ecd"; + sha256 = "0y36ckap8z07b3ayj53l9drz1m4wrg0fd12q8p0cyhhghf0g8s2i"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; - vim-textobj-comment = buildVimPluginFrom2Nix { + vim-textobj-comment = buildVimPlugin { pname = "vim-textobj-comment"; version = "2014-04-11"; src = fetchFromGitHub { @@ -14795,7 +14807,7 @@ final: prev: meta.homepage = "https://github.com/glts/vim-textobj-comment/"; }; - vim-textobj-entire = buildVimPluginFrom2Nix { + vim-textobj-entire = buildVimPlugin { pname = "vim-textobj-entire"; version = "2018-01-19"; src = fetchFromGitHub { @@ -14807,7 +14819,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-entire/"; }; - vim-textobj-function = buildVimPluginFrom2Nix { + vim-textobj-function = buildVimPlugin { pname = "vim-textobj-function"; version = "2014-05-03"; src = fetchFromGitHub { @@ -14819,7 +14831,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-function/"; }; - vim-textobj-haskell = buildVimPluginFrom2Nix { + vim-textobj-haskell = buildVimPlugin { pname = "vim-textobj-haskell"; version = "2014-10-27"; src = fetchFromGitHub { @@ -14831,7 +14843,7 @@ final: prev: meta.homepage = "https://github.com/gibiansky/vim-textobj-haskell/"; }; - vim-textobj-multiblock = buildVimPluginFrom2Nix { + vim-textobj-multiblock = buildVimPlugin { pname = "vim-textobj-multiblock"; version = "2014-06-02"; src = fetchFromGitHub { @@ -14843,7 +14855,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-textobj-multiblock/"; }; - vim-textobj-user = buildVimPluginFrom2Nix { + vim-textobj-user = buildVimPlugin { pname = "vim-textobj-user"; version = "2020-02-21"; src = fetchFromGitHub { @@ -14855,7 +14867,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-user/"; }; - vim-textobj-variable-segment = buildVimPluginFrom2Nix { + vim-textobj-variable-segment = buildVimPlugin { pname = "vim-textobj-variable-segment"; version = "2022-07-16"; src = fetchFromGitHub { @@ -14867,7 +14879,7 @@ final: prev: meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; - vim-themis = buildVimPluginFrom2Nix { + vim-themis = buildVimPlugin { pname = "vim-themis"; version = "2021-12-03"; src = fetchFromGitHub { @@ -14879,7 +14891,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-themis/"; }; - vim-tmux = buildVimPluginFrom2Nix { + vim-tmux = buildVimPlugin { pname = "vim-tmux"; version = "2021-10-04"; src = fetchFromGitHub { @@ -14891,7 +14903,7 @@ final: prev: meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; - vim-tmux-clipboard = buildVimPluginFrom2Nix { + vim-tmux-clipboard = buildVimPlugin { pname = "vim-tmux-clipboard"; version = "2023-04-24"; src = fetchFromGitHub { @@ -14903,7 +14915,7 @@ final: prev: meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; - vim-tmux-focus-events = buildVimPluginFrom2Nix { + vim-tmux-focus-events = buildVimPlugin { pname = "vim-tmux-focus-events"; version = "2021-04-27"; src = fetchFromGitHub { @@ -14915,19 +14927,19 @@ final: prev: meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; - vim-tmux-navigator = buildVimPluginFrom2Nix { + vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2023-08-20"; + version = "2023-09-16"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "addb64a772cb4a3ae1f1363583012b2cada2cd66"; - sha256 = "0vnsjcslz3w02jlkvpnld8wjb73qpninylp0alpniwqyjm43nrl9"; + rev = "7db70e08ea03b3e4d91f63713d76134512e28d7e"; + sha256 = "05mz1lpc0akanxf7pcrlwp08v84x69ah6042cc2pzqsjj5l24a64"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; - vim-togglelist = buildVimPluginFrom2Nix { + vim-togglelist = buildVimPlugin { pname = "vim-togglelist"; version = "2021-12-08"; src = fetchFromGitHub { @@ -14939,7 +14951,7 @@ final: prev: meta.homepage = "https://github.com/milkypostman/vim-togglelist/"; }; - vim-toml = buildVimPluginFrom2Nix { + vim-toml = buildVimPlugin { pname = "vim-toml"; version = "2022-09-24"; src = fetchFromGitHub { @@ -14951,19 +14963,19 @@ final: prev: meta.homepage = "https://github.com/cespare/vim-toml/"; }; - vim-tpipeline = buildVimPluginFrom2Nix { + vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2023-09-10"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2889cbdbe756324e1e21716a34b3d36b058f959e"; - sha256 = "105zmflfvqf6wllm26gwnh7am3g98aywq1d034lpr1c7zm5ln0pv"; + rev = "bff212497e0873ef7c97bd1e3d59cf57d6627581"; + sha256 = "1zpn2l7lzi03glmficfs1jwk7d9c5jn2pp63m818h8810dhicalr"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; - vim-trailing-whitespace = buildVimPluginFrom2Nix { + vim-trailing-whitespace = buildVimPlugin { pname = "vim-trailing-whitespace"; version = "2023-02-28"; src = fetchFromGitHub { @@ -14975,7 +14987,7 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; - vim-tridactyl = buildVimPluginFrom2Nix { + vim-tridactyl = buildVimPlugin { pname = "vim-tridactyl"; version = "2022-11-30"; src = fetchFromGitHub { @@ -14987,7 +14999,7 @@ final: prev: meta.homepage = "https://github.com/tridactyl/vim-tridactyl/"; }; - vim-tsx = buildVimPluginFrom2Nix { + vim-tsx = buildVimPlugin { pname = "vim-tsx"; version = "2017-03-16"; src = fetchFromGitHub { @@ -14999,7 +15011,7 @@ final: prev: meta.homepage = "https://github.com/ianks/vim-tsx/"; }; - vim-twig = buildVimPluginFrom2Nix { + vim-twig = buildVimPlugin { pname = "vim-twig"; version = "2018-05-23"; src = fetchFromGitHub { @@ -15011,7 +15023,7 @@ final: prev: meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; - vim-twiggy = buildVimPluginFrom2Nix { + vim-twiggy = buildVimPlugin { pname = "vim-twiggy"; version = "2022-01-10"; src = fetchFromGitHub { @@ -15023,7 +15035,7 @@ final: prev: meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; - vim-ultest = buildVimPluginFrom2Nix { + vim-ultest = buildVimPlugin { pname = "vim-ultest"; version = "2023-02-09"; src = fetchFromGitHub { @@ -15035,7 +15047,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; - vim-unicoder = buildVimPluginFrom2Nix { + vim-unicoder = buildVimPlugin { pname = "vim-unicoder"; version = "2019-04-16"; src = fetchFromGitHub { @@ -15047,7 +15059,7 @@ final: prev: meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/"; }; - vim-unimpaired = buildVimPluginFrom2Nix { + vim-unimpaired = buildVimPlugin { pname = "vim-unimpaired"; version = "2022-11-21"; src = fetchFromGitHub { @@ -15059,7 +15071,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; - vim-vagrant = buildVimPluginFrom2Nix { + vim-vagrant = buildVimPlugin { pname = "vim-vagrant"; version = "2018-11-11"; src = fetchFromGitHub { @@ -15071,7 +15083,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-vagrant/"; }; - vim-vinegar = buildVimPluginFrom2Nix { + vim-vinegar = buildVimPlugin { pname = "vim-vinegar"; version = "2022-01-11"; src = fetchFromGitHub { @@ -15083,7 +15095,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; - vim-visual-increment = buildVimPluginFrom2Nix { + vim-visual-increment = buildVimPlugin { pname = "vim-visual-increment"; version = "2020-05-03"; src = fetchFromGitHub { @@ -15095,7 +15107,7 @@ final: prev: meta.homepage = "https://github.com/triglav/vim-visual-increment/"; }; - vim-visual-multi = buildVimPluginFrom2Nix { + vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; version = "2022-09-14"; src = fetchFromGitHub { @@ -15107,7 +15119,7 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; - vim-visual-star-search = buildVimPluginFrom2Nix { + vim-visual-star-search = buildVimPlugin { pname = "vim-visual-star-search"; version = "2021-07-14"; src = fetchFromGitHub { @@ -15119,7 +15131,7 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-visual-star-search/"; }; - vim-visualstar = buildVimPluginFrom2Nix { + vim-visualstar = buildVimPlugin { pname = "vim-visualstar"; version = "2015-08-27"; src = fetchFromGitHub { @@ -15131,7 +15143,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; - vim-vp4 = buildVimPluginFrom2Nix { + vim-vp4 = buildVimPlugin { pname = "vim-vp4"; version = "2022-06-06"; src = fetchFromGitHub { @@ -15143,7 +15155,7 @@ final: prev: meta.homepage = "https://github.com/ngemily/vim-vp4/"; }; - vim-vsnip = buildVimPluginFrom2Nix { + vim-vsnip = buildVimPlugin { pname = "vim-vsnip"; version = "2023-09-15"; src = fetchFromGitHub { @@ -15155,7 +15167,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; - vim-vsnip-integ = buildVimPluginFrom2Nix { + vim-vsnip-integ = buildVimPlugin { pname = "vim-vsnip-integ"; version = "2023-07-01"; src = fetchFromGitHub { @@ -15167,7 +15179,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; - vim-vue = buildVimPluginFrom2Nix { + vim-vue = buildVimPlugin { pname = "vim-vue"; version = "2019-08-03"; src = fetchFromGitHub { @@ -15179,31 +15191,31 @@ final: prev: meta.homepage = "https://github.com/posva/vim-vue/"; }; - vim-vue-plugin = buildVimPluginFrom2Nix { + vim-vue-plugin = buildVimPlugin { pname = "vim-vue-plugin"; - version = "2023-02-02"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "leafOfTree"; repo = "vim-vue-plugin"; - rev = "58ac69b2c8a98a9bd2a95fbaa7b5f0fe806bad0f"; - sha256 = "0x8a66r1wlyashyqxmdpz3wnqhgfmscs42m2r82g5ic6a7n6f36l"; + rev = "04c3fb20ed5096a983f71af204afba07cdfa6d6f"; + sha256 = "1cs77gyzvvcrlvvf31ilqzdp5qgzwbdksprn48n2jrdbi3dfl5pp"; }; meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; }; - vim-wakatime = buildVimPluginFrom2Nix { + vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-08-16"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "0d2efa2daff34b27b0d227d4c3b136811c93db93"; - sha256 = "05d2lr6g7ijlxlv9r5szimdpnifa0mb2fidpls9lp8zzvaj2gafk"; + rev = "945a441b83e48c7bafdd227ef8e2eb826f72ab90"; + sha256 = "13qrc8hgp944r819w3sxqva1knpy7m6y2ni9pvpwnf3vykq74l9r"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; - vim-watchdogs = buildVimPluginFrom2Nix { + vim-watchdogs = buildVimPlugin { pname = "vim-watchdogs"; version = "2019-09-09"; src = fetchFromGitHub { @@ -15215,7 +15227,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/"; }; - vim-wayland-clipboard = buildVimPluginFrom2Nix { + vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; version = "2023-09-08"; src = fetchFromGitHub { @@ -15227,7 +15239,7 @@ final: prev: meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; - vim-which-key = buildVimPluginFrom2Nix { + vim-which-key = buildVimPlugin { pname = "vim-which-key"; version = "2023-09-14"; src = fetchFromGitHub { @@ -15239,7 +15251,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; - vim-windowswap = buildVimPluginFrom2Nix { + vim-windowswap = buildVimPlugin { pname = "vim-windowswap"; version = "2018-05-16"; src = fetchFromGitHub { @@ -15251,7 +15263,7 @@ final: prev: meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; }; - vim-wordmotion = buildVimPluginFrom2Nix { + vim-wordmotion = buildVimPlugin { pname = "vim-wordmotion"; version = "2023-02-26"; src = fetchFromGitHub { @@ -15263,7 +15275,7 @@ final: prev: meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; - vim-wordy = buildVimPluginFrom2Nix { + vim-wordy = buildVimPlugin { pname = "vim-wordy"; version = "2022-02-13"; src = fetchFromGitHub { @@ -15275,7 +15287,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-wordy/"; }; - vim-xdebug = buildVimPluginFrom2Nix { + vim-xdebug = buildVimPlugin { pname = "vim-xdebug"; version = "2012-08-15"; src = fetchFromGitHub { @@ -15287,7 +15299,7 @@ final: prev: meta.homepage = "https://github.com/joonty/vim-xdebug/"; }; - vim-xkbswitch = buildVimPluginFrom2Nix { + vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; version = "2023-05-11"; src = fetchFromGitHub { @@ -15299,7 +15311,7 @@ final: prev: meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; - vim-xtabline = buildVimPluginFrom2Nix { + vim-xtabline = buildVimPlugin { pname = "vim-xtabline"; version = "2022-02-03"; src = fetchFromGitHub { @@ -15311,7 +15323,7 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; - vim-yaml = buildVimPluginFrom2Nix { + vim-yaml = buildVimPlugin { pname = "vim-yaml"; version = "2021-01-14"; src = fetchFromGitHub { @@ -15323,7 +15335,7 @@ final: prev: meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; - vim-yapf = buildVimPluginFrom2Nix { + vim-yapf = buildVimPlugin { pname = "vim-yapf"; version = "2018-10-04"; src = fetchFromGitHub { @@ -15335,7 +15347,7 @@ final: prev: meta.homepage = "https://github.com/simonrw/vim-yapf/"; }; - vim-zettel = buildVimPluginFrom2Nix { + vim-zettel = buildVimPlugin { pname = "vim-zettel"; version = "2023-08-17"; src = fetchFromGitHub { @@ -15347,7 +15359,7 @@ final: prev: meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; - vim2hs = buildVimPluginFrom2Nix { + vim2hs = buildVimPlugin { pname = "vim2hs"; version = "2014-04-16"; src = fetchFromGitHub { @@ -15359,7 +15371,7 @@ final: prev: meta.homepage = "https://github.com/dag/vim2hs/"; }; - vim9-stargate = buildVimPluginFrom2Nix { + vim9-stargate = buildVimPlugin { pname = "vim9-stargate"; version = "2023-01-21"; src = fetchFromGitHub { @@ -15371,7 +15383,7 @@ final: prev: meta.homepage = "https://github.com/monkoose/vim9-stargate/"; }; - vim_current_word = buildVimPluginFrom2Nix { + vim_current_word = buildVimPlugin { pname = "vim_current_word"; version = "2023-05-23"; src = fetchFromGitHub { @@ -15383,7 +15395,7 @@ final: prev: meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; - vimacs = buildVimPluginFrom2Nix { + vimacs = buildVimPlugin { pname = "vimacs"; version = "2016-03-24"; src = fetchFromGitHub { @@ -15395,7 +15407,7 @@ final: prev: meta.homepage = "https://github.com/andrep/vimacs/"; }; - vimade = buildVimPluginFrom2Nix { + vimade = buildVimPlugin { pname = "vimade"; version = "2022-01-31"; src = fetchFromGitHub { @@ -15407,7 +15419,7 @@ final: prev: meta.homepage = "https://github.com/TaDaa/vimade/"; }; - vimagit = buildVimPluginFrom2Nix { + vimagit = buildVimPlugin { pname = "vimagit"; version = "2022-07-03"; src = fetchFromGitHub { @@ -15419,7 +15431,7 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; - vimelette = buildVimPluginFrom2Nix { + vimelette = buildVimPlugin { pname = "vimelette"; version = "2019-05-02"; src = fetchFromGitHub { @@ -15431,7 +15443,7 @@ final: prev: meta.homepage = "https://github.com/gotcha/vimelette/"; }; - vimfiler-vim = buildVimPluginFrom2Nix { + vimfiler-vim = buildVimPlugin { pname = "vimfiler.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -15443,7 +15455,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; - vimoutliner = buildVimPluginFrom2Nix { + vimoutliner = buildVimPlugin { pname = "vimoutliner"; version = "2023-08-29"; src = fetchFromGitHub { @@ -15455,7 +15467,7 @@ final: prev: meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; - vimpreviewpandoc = buildVimPluginFrom2Nix { + vimpreviewpandoc = buildVimPlugin { pname = "vimpreviewpandoc"; version = "2023-08-14"; src = fetchFromGitHub { @@ -15467,7 +15479,7 @@ final: prev: meta.homepage = "https://github.com/tex/vimpreviewpandoc/"; }; - vimproc-vim = buildVimPluginFrom2Nix { + vimproc-vim = buildVimPlugin { pname = "vimproc.vim"; version = "2023-01-05"; src = fetchFromGitHub { @@ -15479,7 +15491,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; - vimsence = buildVimPluginFrom2Nix { + vimsence = buildVimPlugin { pname = "vimsence"; version = "2021-05-01"; src = fetchFromGitHub { @@ -15491,7 +15503,7 @@ final: prev: meta.homepage = "https://github.com/vimsence/vimsence/"; }; - vimshell-vim = buildVimPluginFrom2Nix { + vimshell-vim = buildVimPlugin { pname = "vimshell.vim"; version = "2019-07-16"; src = fetchFromGitHub { @@ -15503,32 +15515,32 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; - vimspector = buildVimPluginFrom2Nix { + vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-09-10"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "bee01e1186a65f551de456b0a6eea5b445943b1d"; - sha256 = "1yd0g67vjdqabjjicgwfdsxfbkpmh91w3cfj4m628h4la2iiwg6s"; + rev = "831530b85aad02f2c465047a21452409bfaaf784"; + sha256 = "16s8gvjwxgsasdgb6ljaar2132hnlwki8gfcs2cwpnwkap9rjb29"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; }; - vimtex = buildVimPluginFrom2Nix { + vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-09-11"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2b8a5f16a5768b3ae1780c266b73022dbb658af1"; - sha256 = "0i6rjzkbcibb9dxgk1406w6w1dab5nja0iiqpp1mwgdb28hjrswv"; + rev = "cbb20643b7bfe721902dac5760bf0d4889fb5f7e"; + sha256 = "1zj03aq6yvd8mbfxihha426cipf02x7lg3hcbv5kl6kzk7ckiac3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; - vimux = buildVimPluginFrom2Nix { + vimux = buildVimPlugin { pname = "vimux"; version = "2022-09-26"; src = fetchFromGitHub { @@ -15540,19 +15552,19 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; - vimwiki = buildVimPluginFrom2Nix { + vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2023-07-31"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "f0fe154ede6b11e3db9b058b930005a056a3d1c6"; - sha256 = "1bkhlvr9y22wdl3cgwcfw591d4d0n7hsmfp2y7az4qjnxbk9pkf4"; + rev = "5d86b625f52e80476cb73c0a14ac62d51e7eb36f"; + sha256 = "1b0953d9cjhl9ycbnr38irzrynypjyvczs2ax7wr1zg478pw2aly"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; - virtual-types-nvim = buildVimPluginFrom2Nix { + virtual-types-nvim = buildVimPlugin { pname = "virtual-types.nvim"; version = "2023-04-07"; src = fetchFromGitHub { @@ -15564,7 +15576,7 @@ final: prev: meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; }; - vis = buildVimPluginFrom2Nix { + vis = buildVimPlugin { pname = "vis"; version = "2013-04-26"; src = fetchFromGitHub { @@ -15576,7 +15588,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/vis/"; }; - vissort-vim = buildVimPluginFrom2Nix { + vissort-vim = buildVimPlugin { pname = "vissort.vim"; version = "2014-01-31"; src = fetchFromGitHub { @@ -15588,19 +15600,19 @@ final: prev: meta.homepage = "https://github.com/navicore/vissort.vim/"; }; - vista-vim = buildVimPluginFrom2Nix { + vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-09-14"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "40daf5e97be70a90465182fbbdfba92442bfd8e1"; - sha256 = "17kgca407nzvaddp5416rri46sk6dry1kmxp8kishha3x6fx0iym"; + rev = "58dabc027909330970ac549e52bf799a723878c5"; + sha256 = "0xb385781kll7hrhgm7nw7frjx2fwd2gzriwn9gby2s7m6yx8xib"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; - wal-vim = buildVimPluginFrom2Nix { + wal-vim = buildVimPlugin { pname = "wal.vim"; version = "2020-11-08"; src = fetchFromGitHub { @@ -15612,7 +15624,7 @@ final: prev: meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; - webapi-vim = buildVimPluginFrom2Nix { + webapi-vim = buildVimPlugin { pname = "webapi-vim"; version = "2022-11-23"; src = fetchFromGitHub { @@ -15624,7 +15636,7 @@ final: prev: meta.homepage = "https://github.com/mattn/webapi-vim/"; }; - wgsl-vim = buildVimPluginFrom2Nix { + wgsl-vim = buildVimPlugin { pname = "wgsl.vim"; version = "2023-04-29"; src = fetchFromGitHub { @@ -15636,19 +15648,19 @@ final: prev: meta.homepage = "https://github.com/DingDean/wgsl.vim/"; }; - which-key-nvim = buildVimPluginFrom2Nix { + which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2023-07-28"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "7ccf476ebe0445a741b64e36c78a682c1c6118b7"; - sha256 = "173gxysxw68xnfmkx468cz4g5lw5vz9sg8lj1wdz27wyvlfq8pq7"; + rev = "6962dae3565369363b59dd51fb206051555fcb4d"; + sha256 = "1fcwd2cv9qlfhpdxza2syrqzdhhy672jwqbr8kl3mafg15wpkxaa"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; - whitespace-nvim = buildVimPluginFrom2Nix { + whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; version = "2023-04-18"; src = fetchFromGitHub { @@ -15660,7 +15672,7 @@ final: prev: meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; - wiki-ft-vim = buildVimPluginFrom2Nix { + wiki-ft-vim = buildVimPlugin { pname = "wiki-ft.vim"; version = "2023-05-14"; src = fetchFromGitHub { @@ -15672,19 +15684,19 @@ final: prev: meta.homepage = "https://github.com/lervag/wiki-ft.vim/"; }; - wiki-vim = buildVimPluginFrom2Nix { + wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2023-09-04"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "04fd37ae2b22c2134830a51ad49ed710c140145d"; - sha256 = "0gwxm6l6knskpnb2zh0963dr1il3x1m2la38v0z3vr8h5yn74gah"; + rev = "65b67f3669a0db078dab2750d3c51c680ee14df1"; + sha256 = "1j6bkk2gqmdaszs6q97yxjqnp3akl1wrlbvs6r31pz0faaswaqb8"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; - wilder-nvim = buildVimPluginFrom2Nix { + wilder-nvim = buildVimPlugin { pname = "wilder.nvim"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15696,7 +15708,7 @@ final: prev: meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; - wildfire-vim = buildVimPluginFrom2Nix { + wildfire-vim = buildVimPlugin { pname = "wildfire.vim"; version = "2023-07-22"; src = fetchFromGitHub { @@ -15708,7 +15720,7 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; - winbar-nvim = buildVimPluginFrom2Nix { + winbar-nvim = buildVimPlugin { pname = "winbar.nvim"; version = "2022-07-18"; src = fetchFromGitHub { @@ -15720,7 +15732,7 @@ final: prev: meta.homepage = "https://github.com/fgheng/winbar.nvim/"; }; - windows-nvim = buildVimPluginFrom2Nix { + windows-nvim = buildVimPlugin { pname = "windows.nvim"; version = "2023-01-16"; src = fetchFromGitHub { @@ -15732,7 +15744,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; }; - winshift-nvim = buildVimPluginFrom2Nix { + winshift-nvim = buildVimPlugin { pname = "winshift.nvim"; version = "2022-09-06"; src = fetchFromGitHub { @@ -15744,7 +15756,7 @@ final: prev: meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; - wmgraphviz-vim = buildVimPluginFrom2Nix { + wmgraphviz-vim = buildVimPlugin { pname = "wmgraphviz.vim"; version = "2018-04-26"; src = fetchFromGitHub { @@ -15756,7 +15768,7 @@ final: prev: meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/"; }; - wombat256-vim = buildVimPluginFrom2Nix { + wombat256-vim = buildVimPlugin { pname = "wombat256.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -15768,7 +15780,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/wombat256.vim/"; }; - workflowish = buildVimPluginFrom2Nix { + workflowish = buildVimPlugin { pname = "workflowish"; version = "2015-12-03"; src = fetchFromGitHub { @@ -15780,19 +15792,19 @@ final: prev: meta.homepage = "https://github.com/lukaszkorecki/workflowish/"; }; - wrapping-nvim = buildVimPluginFrom2Nix { + wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2023-08-08"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "1fc811d99b512ca53a4a773580f9ed5394fe6b2a"; - sha256 = "01j0whf2f4bzkq9p1bdpf7bhj1v7sj1bzdq47xck1f7fkkk2i8cr"; + rev = "696febba72939cf9082e0fd9cb9c603254cfa8a6"; + sha256 = "0dqygl72ln9x572a6q3dii9cqnjgfb7l70iw9vifjpv8vsyak20x"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; - wstrip-vim = buildVimPluginFrom2Nix { + wstrip-vim = buildVimPlugin { pname = "wstrip.vim"; version = "2021-03-14"; src = fetchFromGitHub { @@ -15804,7 +15816,7 @@ final: prev: meta.homepage = "https://github.com/tweekmonster/wstrip.vim/"; }; - xptemplate = buildVimPluginFrom2Nix { + xptemplate = buildVimPlugin { pname = "xptemplate"; version = "2022-09-08"; src = fetchFromGitHub { @@ -15816,7 +15828,7 @@ final: prev: meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; - xterm-color-table-vim = buildVimPluginFrom2Nix { + xterm-color-table-vim = buildVimPlugin { pname = "xterm-color-table.vim"; version = "2022-11-21"; src = fetchFromGitHub { @@ -15828,7 +15840,7 @@ final: prev: meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; - yats-vim = buildVimPluginFrom2Nix { + yats-vim = buildVimPlugin { pname = "yats.vim"; version = "2023-08-24"; src = fetchFromGitHub { @@ -15841,7 +15853,7 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; - yescapsquit-vim = buildVimPluginFrom2Nix { + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; src = fetchFromGitHub { @@ -15853,7 +15865,7 @@ final: prev: meta.homepage = "https://github.com/lucasew/yescapsquit.vim/"; }; - yuck-vim = buildVimPluginFrom2Nix { + yuck-vim = buildVimPlugin { pname = "yuck.vim"; version = "2022-10-29"; src = fetchFromGitHub { @@ -15865,7 +15877,7 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; - zeavim-vim = buildVimPluginFrom2Nix { + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; src = fetchFromGitHub { @@ -15877,31 +15889,31 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; - zen-mode-nvim = buildVimPluginFrom2Nix { + zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2023-05-22"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "68f554702de63f4b7b6b6d4bcb10178f41a0acc7"; - sha256 = "0apv5xjihr58h7r4c4wfaswvc3ykw50zk36g0nkk1nymwlflkgh7"; + rev = "cb73b8bd0ef9d765b942db09dc762c603a89ae44"; + sha256 = "0075pic9z24rcwkf90jrd17szv5dxsggpimkn6k6w02v7wwv208v"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; - zenbones-nvim = buildVimPluginFrom2Nix { + zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2023-08-30"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "491b8a79e0547e181c7c6fb054d778fd595f068c"; - sha256 = "1p8fakdby43sk3l54dszib5sf6h58mcmvdd3zvwjxn16diqjd6jd"; + rev = "e2a3fda09b3da0d5a23182a8ffdf03c2c2771794"; + sha256 = "1bjfnd6nz7705gmm5a55y7ml4jsazv4q4wbcxj2i5lnq3nyi5wk0"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; - zenburn = buildVimPluginFrom2Nix { + zenburn = buildVimPlugin { pname = "zenburn"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15913,7 +15925,7 @@ final: prev: meta.homepage = "https://github.com/jnurmine/zenburn/"; }; - zephyr-nvim = buildVimPluginFrom2Nix { + zephyr-nvim = buildVimPlugin { pname = "zephyr-nvim"; version = "2022-12-31"; src = fetchFromGitHub { @@ -15925,31 +15937,31 @@ final: prev: meta.homepage = "https://github.com/nvimdev/zephyr-nvim/"; }; - zig-vim = buildVimPluginFrom2Nix { + zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-07-22"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e"; - sha256 = "0m9p0055x6j5bz7whln7arz6w7cn02wq4rgs1ynczrvbqd68iji2"; + rev = "54c216e5306a5c3878a60596aacb94dca8652ab9"; + sha256 = "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; - zk-nvim = buildVimPluginFrom2Nix { + zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2023-07-09"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "797618aa07f58ceba6f79fb6e777e8e45c51e1ce"; - sha256 = "1hr1k3h3pwh7iga7zdd62hkwgnvivsr6z9nbs8ypks3r34rw60xx"; + rev = "e9e5e21dbeacd0e753728c7ea45b7a7582d9080a"; + sha256 = "0ycx8ad6a9xyc2i4gzjccbl5pzvg1y7rqhpxf4mys5vh5j7iisvv"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; - zoomwintab-vim = buildVimPluginFrom2Nix { + zoomwintab-vim = buildVimPlugin { pname = "zoomwintab.vim"; version = "2021-10-10"; src = fetchFromGitHub { @@ -15961,7 +15973,7 @@ final: prev: meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; - zoxide-vim = buildVimPluginFrom2Nix { + zoxide-vim = buildVimPlugin { pname = "zoxide.vim"; version = "2023-05-21"; src = fetchFromGitHub { @@ -15973,19 +15985,19 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - catppuccin-nvim = buildVimPluginFrom2Nix { + catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-09-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280"; - sha256 = "0cdgh3x417m4xcwqaj4c76fylfnyyjq2az8jbvw5gxrpvz9lmazk"; + rev = "dcef0a062de380885193fb0f919217d58b979753"; + sha256 = "1c0ci2h6b3y89rz3hd5ql885qw3hn3p23m4anbh5a9hppcyxcrli"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; - catppuccin-vim = buildVimPluginFrom2Nix { + catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -15997,7 +16009,7 @@ final: prev: meta.homepage = "https://github.com/catppuccin/vim/"; }; - dracula-vim = buildVimPluginFrom2Nix { + dracula-vim = buildVimPlugin { pname = "dracula-vim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -16009,7 +16021,7 @@ final: prev: meta.homepage = "https://github.com/dracula/vim/"; }; - embark-vim = buildVimPluginFrom2Nix { + embark-vim = buildVimPlugin { pname = "embark-vim"; version = "2023-04-21"; src = fetchFromGitHub { @@ -16021,19 +16033,19 @@ final: prev: meta.homepage = "https://github.com/embark-theme/vim/"; }; - gruvbox-community = buildVimPluginFrom2Nix { + gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; - version = "2023-09-12"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "121309cebfc5a9b4f71b7b962d0d0df7e82cc456"; - sha256 = "0211bkj92rk3gv70p7xlqny481s0qk345cgl05m2l1x6bmcm5zps"; + rev = "86c767ff91e2518da44ba8c78b3bc6c979cf5403"; + sha256 = "1map59hiin7qwwyliqxqwq3v64hskn4xpxisnfpj7ci56c9viby8"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; - mattn-calendar-vim = buildVimPluginFrom2Nix { + mattn-calendar-vim = buildVimPlugin { pname = "mattn-calendar-vim"; version = "2022-02-10"; src = fetchFromGitHub { @@ -16045,19 +16057,19 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; - nightfly = buildVimPluginFrom2Nix { + nightfly = buildVimPlugin { pname = "nightfly"; - version = "2023-09-01"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "2737ba5b8d22ad6803bb0f51099f90c61bab566c"; - sha256 = "07g6s0p9mqs3s65a027zvpwpfmx191ajg0h8v9qilgzw755barx7"; + rev = "9053e99131731f268258ab4d35d4841c3126ff9a"; + sha256 = "02d6b3qwylz6dg56rkccmpn5nipyg1d6capplbzz5pwv3y9g6bsw"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; - nord-vim = buildVimPluginFrom2Nix { + nord-vim = buildVimPlugin { pname = "nord-vim"; version = "2023-05-03"; src = fetchFromGitHub { @@ -16069,19 +16081,19 @@ final: prev: meta.homepage = "https://github.com/nordtheme/vim/"; }; - nvchad-ui = buildVimPluginFrom2Nix { + nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-09-13"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "6c22f52568c4ab080a6676f7bb6515f0076e6567"; - sha256 = "1x7wbh4v5a4scxvdqvi86ql0z9kygw4fg3v7by0r2bcgqy9rxbcy"; + rev = "f4f2197e704b52c0e12f2d03899e9de7f810a170"; + sha256 = "0k0w6i1ska0nc0p47a3jxms058q3pd2k8fhqf7c2qd9dg16r6mb1"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; - pure-lua = buildVimPluginFrom2Nix { + pure-lua = buildVimPlugin { pname = "pure-lua"; version = "2021-05-16"; src = fetchFromGitHub { @@ -16093,7 +16105,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - restore-view-vim = buildVimPluginFrom2Nix { + restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; src = fetchFromGitHub { @@ -16105,7 +16117,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; }; - rose-pine = buildVimPluginFrom2Nix { + rose-pine = buildVimPlugin { pname = "rose-pine"; version = "2023-07-28"; src = fetchFromGitHub { @@ -16117,7 +16129,7 @@ final: prev: meta.homepage = "https://github.com/rose-pine/neovim/"; }; - samodostal-image-nvim = buildVimPluginFrom2Nix { + samodostal-image-nvim = buildVimPlugin { pname = "samodostal-image-nvim"; version = "2023-06-08"; src = fetchFromGitHub { @@ -16129,7 +16141,7 @@ final: prev: meta.homepage = "https://github.com/samodostal/image.nvim/"; }; - tinykeymap = buildVimPluginFrom2Nix { + tinykeymap = buildVimPlugin { pname = "tinykeymap"; version = "2019-03-15"; src = fetchFromGitHub { @@ -16141,7 +16153,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; - vim-advanced-sorters = buildVimPluginFrom2Nix { + vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; version = "2021-11-21"; src = fetchFromGitHub { @@ -16153,14 +16165,14 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; }; - vim-docbk-snippets = buildVimPluginFrom2Nix { + vim-docbk-snippets = buildVimPlugin { pname = "vim-docbk-snippets"; - version = "2023-06-05"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "jhradilek"; repo = "vim-snippets"; - rev = "a279b708a49ca410b41b1628f62c56ab4dc0390b"; - sha256 = "06rnj834nrd0c1g088zfvb2bvbzqzbmbdhga9gza8srjw7p8kvhw"; + rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; + sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; }; meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix index f81b9fc3464e..06ed71f37924 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix @@ -1,10 +1,10 @@ with import <localpkgs> {}; let - inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + inherit (vimUtils.override {inherit vim;}) buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> { - inherit buildNeovimPlugin buildVimPluginFrom2Nix; + inherit buildNeovimPlugin buildVimPlugin; } {} {}; hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch b/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch index abc37992cb3b..ec2408d6f4a8 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch @@ -1,18 +1,18 @@ diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim -index 9eebb56..3a0b069 100644 +index 323b57b..8053ea8 100644 --- a/autoload/health/mkdp.vim +++ b/autoload/health/mkdp.vim -@@ -9,8 +9,8 @@ function! health#mkdp#check() abort - call health#report_info('Pre build: ' . l:mkdp_server_script) - call health#report_info('Pre build version: ' . mkdp#util#pre_build_version()) - call health#report_ok('Using pre build') +@@ -8,8 +8,8 @@ function! health#mkdp#check() abort + lua vim.health.info('Pre build: ' .. vim.api.nvim_eval('l:mkdp_server_script')) + lua vim.health.info('Pre build version: ' .. vim.fn['mkdp#util#pre_build_version']()) + lua vim.health.ok('Using pre build') - elseif executable('node') -- call health#report_info('Node version: ' . system('node --version')) +- lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('node --version'), '^%s*(.-)%s*$', '%1')) + else -+ call health#report_info('Node version: ' . system('@node@ --version')) - let l:mkdp_server_script = s:mkdp_root_dir . '/app/server.js' - call health#report_info('Script: ' . l:mkdp_server_script) - call health#report_info('Script exists: ' . filereadable(l:mkdp_server_script)) ++ lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('@node@ --version'), '^%s*(.-)%s*$', '%1')) + let l:mkdp_server_script = s:mkdp_root_dir .. '/app/server.js' + lua vim.health.info('Script: ' .. vim.api.nvim_eval('l:mkdp_server_script')) + lua vim.health.info('Script exists: ' .. vim.fn.filereadable(vim.api.nvim_eval('l:mkdp_server_script'))) diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim index b257571..57f04e7 100644 --- a/autoload/mkdp/rpc.vim diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3c1e6c2ff411..9990af5145d6 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -16,14 +16,26 @@ }; agda = buildGrammar { language = "agda"; - version = "0.0.0+rev=80ea622"; + version = "0.0.0+rev=c21c3a0"; src = fetchFromGitHub { - owner = "AusCyberman"; + owner = "tree-sitter"; repo = "tree-sitter-agda"; - rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; - hash = "sha256-D63jvITL2RA8yg/TBSi6GsOxwLKzSHibbm3hwIKzesU="; + rev = "c21c3a0f996363ed17b8ac99d827fe5a4821f217"; + hash = "sha256-EV0J38zcfSHaBqzu2Rcut1l20FpB+xneFRaizEX1DXg="; + }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda"; + }; + apex = buildGrammar { + language = "apex"; + version = "0.0.0+rev=a768c95"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; - meta.homepage = "https://github.com/AusCyberman/tree-sitter-agda"; + location = "apex"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; @@ -47,25 +59,36 @@ }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; + authzed = buildGrammar { + language = "authzed"; + version = "0.0.0+rev=1dec7e1"; + src = fetchFromGitHub { + owner = "mleonidas"; + repo = "tree-sitter-authzed"; + rev = "1dec7e1af96c56924e3322cd85fdce15d0a31d00"; + hash = "sha256-qPSQF95DO7WByVy9YXEOus3q3U4QfWuUFbJGVXd4EtQ="; + }; + meta.homepage = "https://github.com/mleonidas/tree-sitter-authzed"; + }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=2444262"; + version = "0.0.0+rev=90c8d9b"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "244426241376b08d9531616290d657106ec8f7ff"; - hash = "sha256-rNQxGMgK9O1wpi1Rdhz/3I210w92AIPAJzEf0v/ICz8="; + rev = "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06"; + hash = "sha256-XbjZtEkJLaecp+j8xgYOVC3ESC1o/rNAZgePsmDdgps="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=bdcd56c"; + version = "0.0.0+rev=7331995"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "bdcd56c5a3896f7bbb7684e223c43d9f24380351"; - hash = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; + rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94"; + hash = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -82,12 +105,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=358e5ec"; + version = "0.0.0+rev=484f508"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "358e5ecbb87109eef7fd596ea518a4ff74cb9b31"; - hash = "sha256-vz8FU+asnMqF6J4UZer4iecw8uFFiYVpz4Fs/ds4Rt0="; + rev = "484f50849bcce887c86451f532bf778689ca8523"; + hash = "sha256-5k5sHW9xabbCFJXHJfs8oBlCjIBa6L3OtDdKEVXLgOc="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -115,12 +138,12 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=ed92abd"; + version = "0.0.0+rev=6cb07d9"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "ed92abd7b67ab66a6fa3a747a0157f01d2e467d8"; - hash = "sha256-HfWUDYiBCmtlu5fFX287BSDHyCiD7gqIVFDTxH5APAE="; + rev = "6cb07d98f1cad180b8ea28965e59ee05023a5693"; + hash = "sha256-KfX0vzxHn4XVtmjOSPl31t17e+rSEoSacjAFQCl4+Ik="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; @@ -137,12 +160,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=a2b7bac"; + version = "0.0.0+rev=25371f9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "a2b7bac3b313efbaa683d9a276ff63cdc544d960"; - hash = "sha256-39i06oXMQemfq3Y4TTXai6HFXvURVOif1v2i9LP4sAI="; + rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"; + hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -214,12 +237,12 @@ }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=c9a7e2d"; + version = "0.0.0+rev=aefcc28"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "c9a7e2df7cac2dfb730f766a4f343308f84ff346"; - hash = "sha256-7k2LkfzlY+UxQvB1dPP6KQM2UTwThaj5NoAIKDVYAhA="; + rev = "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"; + hash = "sha256-ihkBqdYVulTlysb9J8yg4c5XVktJw8jIwzhqybBw8Ug="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; @@ -303,12 +326,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=f00c914"; + version = "0.0.0+rev=3161aed"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "f00c91430124797e798cbf28e09075d7d192938a"; - hash = "sha256-9Jx6O4yfIrbCLTEPgpoZZ+3yxhi2r0MwrbiHCUexa60="; + rev = "3161aed045130c900f870ef53fad93a574317769"; + hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,12 +404,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=c0a9d69"; + version = "0.0.0+rev=33e22c3"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"; - hash = "sha256-dNrLw9E3I3LqQUqYx+YUBZTlSoAp/qoOf6+RL7Lv3ew="; + rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"; + hash = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -471,12 +494,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=0694058"; + version = "0.0.0+rev=debe14f"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "0694058bf0555adbf5f700ce4868d18e463cb824"; - hash = "sha256-xalcXMXRHcpwhKLMF6p9y5lzC0ek/ljRq2Vnb1VwXBo="; + rev = "debe14fad40a8100c679d95c66f599b48111742c"; + hash = "sha256-tB03/AqoYIMyWFGv3nKlGY/EjNV1/IQyXQsC+0M51V8="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -515,12 +538,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=7aa24fe"; + version = "0.0.0+rev=bb06a83"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"; - hash = "sha256-7rhwMBq5u5bVjyCE4j3f5tzY+9jL80Xd5hgkJjlqSr8="; + rev = "bb06a83db4f0c176875d9d49756b760d15211134"; + hash = "sha256-IAUX5wrVpAj50cG0hrclhCx9x1hjSKdjqvEUYpe5a+g="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -636,12 +659,12 @@ }; git_config = buildGrammar { language = "git_config"; - version = "0.0.0+rev=a01b498"; + version = "0.0.0+rev=9c2a1b7"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-config"; - rev = "a01b498b25003d97a5f93b0da0e6f28307454347"; - hash = "sha256-9gLmao4zmDYj7uxrngjMa4AG9yIkKyptgaCBcL4GZYA="; + rev = "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"; + hash = "sha256-O0w0BhhPPwhnKfniAFSPMWfBsZUTrijifAsmFiAncWg="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config"; }; @@ -691,34 +714,34 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=297031d"; + version = "0.0.0+rev=32c8f1e"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "297031dce60e07acf90345d62777623469e46027"; - hash = "sha256-/LieoIseeZwQttCHnAOfwWRpCmBnUdWTcGwSOyjHexg="; + rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c"; + hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=d3031a8"; + version = "0.0.0+rev=f9746dc"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "d3031a8294bf331600d5046b1d14e690a0d8ba0c"; - hash = "sha256-YvftQHEwYxRyRIYHrnAjIqgx6O0FlFrnF9TwUE+RiqI="; + rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1"; + hash = "sha256-57Sp4LrvyNNuOc+8ZiHl6cwvGg1tmXZemRsWeW+Kzys="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=64e786e"; + version = "0.0.0+rev=952739a"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "64e786e36398b1e18ccfdbfd964d922a67392ebc"; - hash = "sha256-6G5j3xfkbcFjAT6OWQyTgeryJEW2SSnyOhedF0QPmSw="; + rev = "952739a25a7c014882aa777f1a32da8950f31f58"; + hash = "sha256-f68bObZPZuPvzyLYP/PeZKbtG0YqbX8BhsLyviBfRY4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -801,15 +824,26 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=76e02db"; + version = "0.0.0+rev=ae8aa51"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-groovy"; - rev = "76e02db5866dd2b096512103ed4d8f630cc32980"; - hash = "sha256-H6Gp7MqGxU1oONq/w8p8pNR3Vhi68dvO+2aHw8anBTs="; + rev = "ae8aa51ec3275afb567a4a67df1a26d89feb135f"; + hash = "sha256-K9XoSVuAWXJCTxclod4pfxnGHhsbtdE7Xi60wfuCE8M="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; }; + gstlaunch = buildGrammar { + language = "gstlaunch"; + version = "0.0.0+rev=2c0d9c9"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-gstlaunch"; + rev = "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"; + hash = "sha256-H5H1v4xJSPHW0oaTY/JczhfVmYExbrdfdugYkMJktPY="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch"; + }; hack = buildGrammar { language = "hack"; version = "0.0.0+rev=fca1e29"; @@ -834,23 +868,23 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=9970682"; + version = "0.0.0+rev=d7ac98f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "99706824b92f162d4e0f47c7e930bbccb367276e"; - hash = "sha256-JJvXkunDFRjWoXipxl1o2P+lRIDa4kw/Ys3LUu3piIY="; + rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"; + hash = "sha256-XEfZSNnvF2BMOWwTfk6GXSnSpbKVfAYk7I3XbO1tIBg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; haskell_persistent = buildGrammar { language = "haskell_persistent"; - version = "0.0.0+rev=58a6ccf"; + version = "0.0.0+rev=577259b"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "tree-sitter-haskell-persistent"; - rev = "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"; - hash = "sha256-p4Anm/xeG/d7nYBPDABcdDih/a+0rMjwtVUJru7m9QY="; + rev = "577259b4068b2c281c9ebf94c109bd50a74d5857"; + hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ="; }; meta.homepage = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent"; }; @@ -889,12 +923,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=d698c21"; + version = "0.0.0+rev=f2902bd"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4"; - hash = "sha256-oFpoErrhr83yG5c3IksjL/XjmsCrZGTP6+Sfu5fvOZM="; + rev = "f2902bd614e3916bdf65e1bc9ad45ebd08417bba"; + hash = "sha256-tuie4Yzauejf+5Par2qnWfaQgOLhROL2le1+UTq5cSY="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -922,12 +956,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=e5d7d7d"; + version = "0.0.0+rev=d742025"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"; - hash = "sha256-jNAPumz8JdrGwSMow1xZqz3n2CHj60qUaivhJ8LZDz4="; + rev = "d742025fa2d8e6100f134a6ea990443aa1f074b3"; + hash = "sha256-ZpUruxwi9S+gUy/k0DkhDGWLc65XppUhD0NeVVItYg4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -999,12 +1033,12 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=83044af"; + version = "0.0.0+rev=2b57cd9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "83044af4950e9f1adb46a20f616d10934930ce7e"; - hash = "sha256-i3j55vAQV5TaMR7IsUkh0OrLCP95Xos0UCI0SoY5phI="; + rev = "2b57cd9541f9fd3a89207d054ce8fbe72657c444"; + hash = "sha256-Zo+KQ6TOjdJODNppTkt8XPE+WroNB5M6+n2XF+OrD8o="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; @@ -1043,23 +1077,23 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=ca3f891"; + version = "0.0.0+rev=3fef30d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f"; - hash = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0="; + rev = "3fef30de8aee74600f25ec2e319b62a1a870d51e"; + hash = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=5dd5cdc"; + version = "0.0.0+rev=c23f7a9"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; - hash = "sha256-B3wZS/OtW4hKOHsoYdYK2zsJGID8fuIm8C+IuAteR9E="; + rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"; + hash = "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1120,12 +1154,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=06a2f6e"; + version = "0.0.0+rev=5baa0fe"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7"; - hash = "sha256-HF3wp4nNwgP0LhZvxQKMnPqMPhwu8Xc9khgiQoy6DeA="; + rev = "5baa0fe2288830f88bd38e328b08d829f3914164"; + hash = "sha256-e2X8Hl8N8iTL0JUJhyyeebNPZ63QAq9C+R5F2lOYZKk="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1162,6 +1196,17 @@ }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; + liquidsoap = buildGrammar { + language = "liquidsoap"; + version = "0.0.0+rev=bbef4df"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "tree-sitter-liquidsoap"; + rev = "bbef4df4dc5b324455ad1ea4770bbed0df5130ea"; + hash = "sha256-SGWO/sQ022atbX8qTXWeSnrYlSX13N03LhXJoc9YgPQ="; + }; + meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; + }; llvm = buildGrammar { language = "llvm"; version = "0.0.0+rev=1b96e58"; @@ -1186,12 +1231,12 @@ }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=8981072"; + version = "0.0.0+rev=990926b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "8981072676ec8bd74def6134be4f883655f7c082"; - hash = "sha256-HRHZDX0/duvQza0SJwCI/uKO0d12VYtvpuYB+KCkfow="; + rev = "990926b13488a4bc0fc0804fc0f8400b5b0a1fb4"; + hash = "sha256-LU8zF6gM8tlwfbdUy/tlg5ubhyFKUrwF/vU8NPXlOGQ="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1319,6 +1364,17 @@ generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; + nasm = buildGrammar { + language = "nasm"; + version = "0.0.0+rev=3bc691d"; + src = fetchFromGitHub { + owner = "naclsn"; + repo = "tree-sitter-nasm"; + rev = "3bc691d2cfba44bea339a775ad496c8bc552c60d"; + hash = "sha256-o4aXvPhXSYMc1oaagIbnFhpqcbWdN8dhMa3QRE/iRMM="; + }; + meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; + }; nickel = buildGrammar { language = "nickel"; version = "0.0.0+rev=b759233"; @@ -1354,12 +1410,12 @@ }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=1a30509"; + version = "0.0.0+rev=014073f"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "1a305093569632de50f9a316ff843dcda25b4ef5"; - hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI="; + rev = "014073fe8016d1ac440c51d22c77e3765d8f6855"; + hash = "sha256-0wL3Pby7e4nbeVHCRfWwxZfEcAF9/s8e6Njva+lj+Rc="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1489,12 +1545,12 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=ce2c73a"; + version = "0.0.0+rev=92a98ad"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ce2c73a8d84b5648e8792698dc9fd955e5f6a906"; - hash = "sha256-HZOIz9KiZ13aqeQtCeQln56RRRPUSgT7ulPJs54fzJc="; + rev = "92a98adaa534957b9a70b03e9acb9ccf9345033a"; + hash = "sha256-/JI1eyf1UZmtQ7bhfBLpA+8mMfIc8jRncri8Mz2mf5M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1644,12 +1700,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=c01fb4e"; + version = "0.0.0+rev=82f5c99"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "c01fb4e38587e959b9058b8cd34b9e6a3068c827"; - hash = "sha256-cV/QwvEQkIQcgo0Pm+3pUH2LhpYOPsuWMgjXMa8dv+s="; + rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"; + hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1809,12 +1865,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=2ca8c12"; + version = "0.0.0+rev=3c03a4b"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "2ca8c123c82ca41f41b66b5d13d403cff0204b78"; - hash = "sha256-aCeKxuBRLPYM8CjVLP5cBUhtuAezzZpGfCE2UaJj1E4="; + rev = "3c03a4bb2c27f1fa76f1ca5563c1fc10187e4028"; + hash = "sha256-WEerUDni10WpXKXX9r6pMwKn3Z9xqIKnlkQDxJiXxxY="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -1831,23 +1887,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=17a6b15"; + version = "0.0.0+rev=48e0533"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "17a6b15562b09db1f27b8f5f26f17edbb2aac097"; - hash = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; + rev = "48e053397b587de97790b055a1097b7c8a4ef846"; + hash = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=70afdd5"; + version = "0.0.0+rev=1b4c2fa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "70afdd5632d57dd63a960972ab25945e353a52f6"; - hash = "sha256-bi0Lqo/Zs2Uaz1efuKAARpEDg5Hm59oUe7eSXgL1Wow="; + rev = "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"; + hash = "sha256-93uWT5KMqCUwntdL5U2Vc71ci+uP3OdP9y6kVZ3bYLo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1940,6 +1996,30 @@ }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; + soql = buildGrammar { + language = "soql"; + version = "0.0.0+rev=a768c95"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + }; + location = "soql"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; + sosl = buildGrammar { + language = "sosl"; + version = "0.0.0+rev=a768c95"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + }; + location = "sosl"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; sparql = buildGrammar { language = "sparql"; version = "0.0.0+rev=05f949d"; @@ -1953,12 +2033,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=39750c4"; + version = "0.0.0+rev=36c4de3"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "39750c48bf9ad63bcc1399554355b0aa0aaa1c33"; - hash = "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y="; + rev = "36c4de35f76dfa732493aae606feb69dce4b1daa"; + hash = "sha256-D8gt0shaEU1zPjLHe+h/cCk6Z1xx5Va17A/0XDB1rvo="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1973,6 +2053,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; + ssh_config = buildGrammar { + language = "ssh_config"; + version = "0.0.0+rev=e400863"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-ssh-config"; + rev = "e4008633536870f3fed3198c96503250af0b0a12"; + hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; + }; starlark = buildGrammar { language = "starlark"; version = "0.0.0+rev=c45ce2b"; @@ -2030,12 +2121,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=10eb01d"; + version = "0.0.0+rev=7e4ccc9"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "10eb01d29827f24b1271672e89790661d94da9e1"; - hash = "sha256-5oHc2mGxOuvFQ1h1FEK0oJ7PYnKayoJSVHeuYleVE8o="; + rev = "7e4ccc97a25315022a70b730085deccd5680a39b"; + hash = "sha256-1Uln7GHlgtNd7/3+FSBNDlTCqYodRbUyytPZYf660Nk="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2064,12 +2155,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=5e6ce99"; + version = "0.0.0+rev=b075f2f"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "5e6ce99611b2fef9b4d812e43898b176185c61ed"; - hash = "sha256-3gRMvJh8vVr7E2b0/RDGqjrlhzjZciWgOYbE+e3dkeE="; + rev = "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a"; + hash = "sha256-NoJLMzyQmE4XpI1KKyq5GkkotOl8MU/zniTnP2nkjes="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2108,6 +2199,17 @@ location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; + textproto = buildGrammar { + language = "textproto"; + version = "0.0.0+rev=8dacf02"; + src = fetchFromGitHub { + owner = "PorterAtGoogle"; + repo = "tree-sitter-textproto"; + rev = "8dacf02aa402892c91079f8577998ed5148c0496"; + hash = "sha256-MpQTrNjjNO2Bj5qR6ESwI9SZtJPmcS6ckqjAR0qaLx8="; + }; + meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto"; + }; thrift = buildGrammar { language = "thrift"; version = "0.0.0+rev=d4deb1b"; @@ -2177,12 +2279,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=b1bf482"; + version = "0.0.0+rev=d847898"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; + hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2211,12 +2313,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=b1bf482"; + version = "0.0.0+rev=d847898"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; + hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2246,12 +2348,12 @@ }; usd = buildGrammar { language = "usd"; - version = "0.0.0+rev=718a6b3"; + version = "0.0.0+rev=ab8c30b"; src = fetchFromGitHub { owner = "ColinKennedy"; repo = "tree-sitter-usd"; - rev = "718a6b3e939904e0b4fe7cff6742e96af4781f4b"; - hash = "sha256-6U4TreAeAGB7WRUtTXdxQvNa6Sl6E+f329/SZ6DOQ+0="; + rev = "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"; + hash = "sha256-Y7AYRpiblBd8xun73UohIf8FFkbNIqSXv44bM3L5uDc="; }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd"; }; @@ -2313,23 +2415,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=77e9e96"; + version = "0.0.0+rev=32c76f1"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "77e9e96c2ae5cff7343ce3dced263483acf95793"; - hash = "sha256-YGE/up7TE1+a6FrN8iEeHbAJr6kEMcWLMPaeyQRRVLs="; + rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55"; + hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=c0f8580"; + version = "0.0.0+rev=60045f7"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"; - hash = "sha256-pBdfFeJbZJy6pjr2a0SgFyjEZKvajKOfrqoRAMB66V8="; + rev = "60045f7d717eba85fa8abd996e0bb50eed5a3d8e"; + hash = "sha256-FW+sPrzFQxKkWkyX2q+s+RBIMCOUWOt38vj2DzAaJ4I="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2368,12 +2470,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=430ec75"; + version = "0.0.0+rev=bde9356"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "430ec7527a3eee00719ce9735854177629410f63"; - hash = "sha256-vfmpob+2yh/Lnhc6b+Lz0nB7bwk2tMbbIFs1iASj19M="; + rev = "bde93562c6dae6aaffd641cb367356386da412d0"; + hash = "sha256-Fv2tc7KmY9Hn5TqO5JKjbj33rYQvLQwpzBYO+W0bySU="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index bbacc6959c25..4b70d8555dd2 100755 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -2,36 +2,20 @@ #!nix-shell update-shell.nix -i python import json +import logging import subprocess from concurrent.futures import ThreadPoolExecutor -from os import environ -from os.path import dirname, join - -lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json"))) - -configs = json.loads( - subprocess.check_output( - [ - "nvim", - "--headless", - "-u", - "NONE", - "+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))", - "+quit!", - ] - ) -) - - -def generate_grammar(item): - lang, lock = item - cfg = configs.get(lang) - if not cfg: - return "" +import os +import sys +from os.path import join +log = logging.getLogger("vim-updater") + + +def generate_grammar(lang, rev, cfg): + """Generate grammar for a language""" info = cfg["install_info"] url = info["url"] - rev = lock["revision"] generated = f""" {lang} = buildGrammar {{ language = "{lang}"; @@ -58,20 +42,57 @@ def generate_grammar(item): return generated -generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +def update_grammars(nvim_treesitter_dir: str): + """ + The lockfile contains just revisions so we start neovim to dump the + grammar information in a better format + """ + # the lockfile + cmd = [ + "nvim", + "--headless", + "-u", + "NONE", + "--cmd", + f"set rtp^={nvim_treesitter_dir}", + "+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))", + "+quit!", + ] + log.debug("Running command: %s", ' '.join(cmd)) + configs = json.loads(subprocess.check_output(cmd)) + + generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py { buildGrammar, """ -generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) + generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) -generated_file += """ }: + generated_file += """ }: { """ -for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): - generated_file += generated + lockfile_path = os.path.join(nvim_treesitter_dir, "lockfile.json") + log.debug("Opening %s", lockfile_path) + with open(lockfile_path) as lockfile_fd: + lockfile = json.load(lockfile_fd) + + def _generate_grammar(item): + lang, lock = item + cfg = configs.get(lang) + if not cfg: + return "" + return generate_grammar(lang, lock["revision"], cfg) + + for generated in ThreadPoolExecutor(max_workers=5).map( + _generate_grammar, lockfile.items() + ): + generated_file += generated + + generated_file += "}\n" + return generated_file -generated_file += "}\n" -open(join(dirname(__file__), "generated.nix"), "w").write(generated_file) +if __name__ == "__main__": + generated = update_grammars(sys.args[1]) + open(join(os.path.dirname(__file__), "generated.nix"), "w").write(generated) diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 299270a118f6..b597fbeb6e98 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3,7 +3,7 @@ # nixpkgs functions , buildGoModule -, buildVimPluginFrom2Nix +, buildVimPlugin , fetchFromGitHub , fetchFromSourcehut , fetchpatch @@ -153,7 +153,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - bitbake-vim = buildVimPluginFrom2Nix { + bitbake-vim = buildVimPlugin { pname = "bitbake.vim"; version = "2021-02-06"; src = fetchFromGitHub { @@ -165,6 +165,19 @@ self: super: { meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; + # The GitHub repository returns 404, which breaks the update script + vim-pony = buildVimPlugin { + pname = "vim-pony"; + version = "2018-07-27"; + src = fetchFromGitHub { + owner = "jakwings"; + repo = "vim-pony"; + rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; + sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; + }; + meta.homepage = "https://github.com/jakwings/vim-pony/"; + }; + chadtree = super.chadtree.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ pynvim-pp @@ -305,7 +318,7 @@ self: super: { dependencies = with self; [ nvim-cmp zsh ]; }; - coc-nginx = buildVimPluginFrom2Nix { + coc-nginx = buildVimPlugin { pname = "coc-nginx"; inherit (nodePackages."@yaegassy/coc-nginx") version meta; src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; @@ -553,7 +566,7 @@ self: super: { # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim # plugin, since part of the fzf vim plugin is included in the main fzf # program. - fzfWrapper = buildVimPluginFrom2Nix { + fzfWrapper = buildVimPlugin { inherit (fzf) src version; pname = "fzf"; postInstall = '' @@ -594,7 +607,7 @@ self: super: { }; # https://hurl.dev/ - hurl = buildVimPluginFrom2Nix { + hurl = buildVimPlugin { pname = "hurl"; version = hurl.version; # dontUnpack = true; @@ -658,7 +671,7 @@ self: super: { ''; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "LanguageClient-neovim"; inherit version; src = LanguageClient-neovim-src; @@ -707,7 +720,7 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; - magma-nvim-goose = buildVimPluginFrom2Nix { + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; src = fetchFromGitHub { @@ -767,7 +780,7 @@ self: super: { dependencies = with self; [ mason-nvim ]; }; - meson = buildVimPluginFrom2Nix { + meson = buildVimPlugin { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; meta.maintainers = with lib.maintainers; [ vcunat ]; @@ -785,7 +798,7 @@ self: super: { vimCommandCheck = "MinimapToggle"; }; - minsnip-nvim = buildVimPluginFrom2Nix { + minsnip-nvim = buildVimPlugin { pname = "minsnip.nvim"; version = "2022-01-04"; src = fetchFromGitHub { @@ -939,7 +952,7 @@ self: super: { inherit parinfer-rust; - phpactor = buildVimPluginFrom2Nix { + phpactor = buildVimPlugin { inherit (phpactor) pname src meta version; postPatch = '' substituteInPlace plugin/phpactor.vim \ @@ -986,14 +999,21 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-JwEOfxGH2wiFkdepxBsUYrpQ2kMV6koqpkD7s+gbWw8="; + cargoHash = "sha256-wJpJELVgzixzu8T9EHACur3LNm/sqfkkbGn+AkApzW4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; + prePatch = '' + rm .cargo/config.toml + ''; + + env.OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--workspace" ]; # tests are broken @@ -1008,7 +1028,7 @@ self: super: { ''; }); - skim = buildVimPluginFrom2Nix { + skim = buildVimPlugin { pname = "skim"; inherit (skim) version; src = skim.vim; @@ -1020,23 +1040,27 @@ self: super: { sniprun = let - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw="; + hash = "sha256-Lh4S7n+bNbdzjDt4lAL271VeYO3cotMD/kbAbV20C0U="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + # Cargo.lock is outdated preBuild = '' cargo update --offline ''; - cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks="; + cargoHash = "sha256-N+Okln3irqevUHC+ZUDQgQXhJ767peKMmsnt/sT77o8="; nativeBuildInputs = [ makeWrapper ]; @@ -1048,7 +1072,7 @@ self: super: { doCheck = false; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "sniprun"; inherit version src; @@ -1061,7 +1085,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - Spacegray-vim = buildVimPluginFrom2Nix { + Spacegray-vim = buildVimPlugin { pname = "Spacegray.vim"; version = "2021-07-06"; src = fetchFromGitHub { @@ -1086,7 +1110,7 @@ self: super: { dependencies = with self; [ nvim-treesitter ]; }; - statix = buildVimPluginFrom2Nix rec { + statix = buildVimPlugin rec { inherit (statix) pname src meta; version = "0.1.0"; postPatch = '' @@ -1136,7 +1160,7 @@ self: super: { }; }; - taskwarrior = buildVimPluginFrom2Nix { + taskwarrior = buildVimPlugin { inherit (taskwarrior) version pname; src = "${taskwarrior.src}/scripts/vim"; }; @@ -1222,7 +1246,7 @@ self: super: { au BufNewFile,BufRead Tupfile,*.tup setf tup ''; in - buildVimPluginFrom2Nix { + buildVimPlugin { inherit (tup) pname version src; preInstall = '' mkdir -p vim-plugin/syntax vim-plugin/ftdetect @@ -1233,6 +1257,10 @@ self: super: { meta.maintainers = with lib.maintainers; [enderger]; }; + typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { + dependencies = with self; [ nvim-lspconfig plenary-nvim ]; + }; + unicode-vim = let unicode-data = fetchurl { @@ -1546,7 +1574,7 @@ self: super: { ''; }; - vim2nix = buildVimPluginFrom2Nix { + vim2nix = buildVimPlugin { pname = "vim2nix"; version = "1.0"; src = ./vim2nix; @@ -1570,7 +1598,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - VimCompletesMe = buildVimPluginFrom2Nix { + VimCompletesMe = buildVimPlugin { pname = "VimCompletesMe"; version = "2022-02-18"; src = fetchFromGitHub { @@ -1706,7 +1734,7 @@ self: super: { "coc-yaml" "coc-yank" ]; - nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + nodePackage2VimPackage = name: buildVimPlugin { pname = name; inherit (nodePackages.${name}) version meta; src = "${nodePackages.${name}}/lib/node_modules/${name}"; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix deleted file mode 100644 index eae7db7f53ec..000000000000 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs ? import ../../../../.. { } }: - -# Ideally, pkgs points to default.nix file of Nixpkgs official tree -with pkgs; -let - pyEnv = python3.withPackages (ps: [ ps.gitpython ]); -in - -mkShell { - packages = [ - bash - pyEnv - nix - nix-prefetch-scripts - ]; -} diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/update.py b/nixpkgs/pkgs/applications/editors/vim/plugins/update.py index b77032849b39..e7e50c21d475 100755 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/update.py +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/update.py @@ -1,97 +1,109 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-shell.nix -i python3 - +#!/usr/bin/env python +# run with: +# $ nix run .\#vimPluginsUpdater # format: -# $ nix run nixpkgs.python3Packages.black -c black update.py +# $ nix run nixpkgs#python3Packages.black -- update.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py -# If you see `HTTP Error 429: too many requests` errors while running this script, -# refer to: +# If you see `HTTP Error 429: too many requests` errors while running this +# script, refer to: # # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs # -# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree). +# (or the equivalent file /doc/languages-frameworks/vim.section.md +# from Nixpkgs master tree). # import inspect import os -import sys import logging -import subprocess import textwrap +import json +import subprocess from typing import List, Tuple from pathlib import Path -import git -log = logging.getLogger() +log = logging.getLogger("vim-updater") sh = logging.StreamHandler() -formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s') +formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s") sh.setFormatter(formatter) log.addHandler(sh) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree -sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate +import importlib from pluginupdate import run_nix_expr, PluginDesc +import treesitter - -GET_PLUGINS_LUA = """ -with import <localpkgs> {}; -lib.attrNames lua51Packages""" - HEADER = ( "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) -def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: - ''' - Whether it's a neovim-only plugin - We can check if it's available in lua packages - ''' - global luaPlugins - if plug.normalized_name in luaPlugins: - log.debug("%s is a neovim plugin", plug) - return True - return False +NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter" class VimEditor(pluginupdate.Editor): nvim_treesitter_updated = False - def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str): + def generate_nix( + self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str + ): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) - nvim_treesitter_rev = pluginupdate.run_nix_expr("(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev") + nvim_treesitter_rev = pluginupdate.run_nix_expr( + "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev", self.nixpkgs + ) with open(outfile, "w+") as f: f.write(HEADER) - f.write(textwrap.dedent(""" - { lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: + f.write( + textwrap.dedent( + """ + { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { """ - )) + ) + ) for pdesc, plugin in sorted_plugins: content = self.plugin2nix(pdesc, plugin) f.write(content) - if plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev: + if ( + plugin.name == "nvim-treesitter" + and plugin.commit != nvim_treesitter_rev + ): self.nvim_treesitter_updated = True f.write("\n}\n") print(f"updated {outfile}") def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: + GET_PLUGINS_LUA = """ + with import <localpkgs> {}; + lib.attrNames lua51Packages""" + luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs) repo = pdesc.repo - isNeovim = isNeovimPlugin(plugin) + + def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + """ + Whether it's a neovim-only plugin + We can check if it's available in lua packages + """ + # global luaPlugins + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + + isNeovim = _isNeovimPlugin(plugin) content = f" {plugin.normalized_name} = " src_nix = repo.as_nix(plugin) @@ -103,39 +115,56 @@ class VimEditor(pluginupdate.Editor): }}; """.format( - buildFn="buildNeovimPlugin" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo) + buildFn="buildNeovimPlugin" if isNeovim else "buildVimPlugin", + plugin=plugin, + src_nix=src_nix, + repo=repo, + ) log.debug(content) return content - def update(self, args): pluginupdate.update_plugins(self, args) + # TODO this should probably be skipped when running outside a nixpkgs checkout if self.nvim_treesitter_updated: print("updating nvim-treesitter grammars") - nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter") - subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) + cmd = [ + "nix", "build", + "vimPlugins.nvim-treesitter.src", "-f", self.nixpkgs + , "--print-out-paths" + ] + log.debug("Running command: %s", " ".join(cmd)) + nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip() + + generated = treesitter.update_grammars(nvim_treesitter_dir) + treesitter_generated_nix_path = os.path.join( + NIXPKGS_NVIMTREESITTER_FOLDER, + "generated.nix" + ) + open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated) if self.nixpkgs_repo: index = self.nixpkgs_repo.index for diff in index.diff(None): - if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix": + if diff.a_path == treesitter_generated_nix_path: msg = "vimPlugins.nvim-treesitter: update grammars" print(f"committing to nixpkgs: {msg}") - index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.add([treesitter_generated_nix_path]) index.commit(msg) return print("no updates to nvim-treesitter grammars") def main(): - global luaPlugins - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) - with open(f"{ROOT}/get-plugins.nix") as f: + log.debug(f"Loading from {ROOT}/../get-plugins.nix") + with open(f"{ROOT}/../get-plugins.nix") as f: GET_PLUGINS = f.read() - editor = VimEditor("vim", ROOT, GET_PLUGINS) + editor = VimEditor( + "vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS + ) editor.run() diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix new file mode 100644 index 000000000000..afa245d9be9e --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix @@ -0,0 +1,44 @@ +{ buildPythonApplication +, nix +, makeWrapper +, python3Packages +, lib +, nix-prefetch-git +, nurl + +# optional +, vimPlugins +, neovim +}: +buildPythonApplication { + format = "other"; + pname = "vim-plugins-updater"; + version = "0.1"; + + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + + pythonPath = [ + python3Packages.gitpython + ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp ${./update.py} $out/bin/vim-plugins-updater + cp ${./get-plugins.nix} $out/get-plugins.nix + cp ${./nvim-treesitter/update.py} $out/lib/treesitter.py + cp ${../../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ + nix nix-prefetch-git neovim nurl ]}" --prefix PYTHONPATH : "$out/lib" ) + wrapPythonPrograms + ''; + + meta.mainProgram = "vim-plugins-updater"; +} + diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 4236cf79e135..271f50919fc5 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -53,7 +53,7 @@ let }; in -vimUtils.buildVimPluginFrom2Nix { +vimUtils.buildVimPlugin { pname = "vim-clap"; inherit version src meta; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0a92f46e741b..ab353da48e24 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -353,7 +353,7 @@ https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, -https://github.com/phaazon/hop.nvim/,, +https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, @@ -551,6 +551,7 @@ https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, +https://github.com/nvimtools/none-ls.nvim/,HEAD, https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,HEAD, @@ -863,6 +864,7 @@ https://github.com/Pocco81/true-zen.nvim/,, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, +https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/kaarmu/typst.vim/,HEAD, @@ -1167,7 +1169,6 @@ https://github.com/junegunn/vim-plug/,, https://github.com/powerman/vim-plugin-AnsiEsc/,, https://github.com/hasundue/vim-pluto/,HEAD, https://github.com/sheerun/vim-polyglot/,, -https://github.com/jakwings/vim-pony/,, https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix index 16317a5d0c66..7b023118f057 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -392,8 +392,9 @@ rec { inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath toVimPlugin; - }) buildVimPlugin buildVimPluginFrom2Nix; + }) buildVimPlugin; + buildVimPluginFrom2Nix = lib.warn "buildVimPluginFrom2Nix is deprecated: use buildVimPlugin instead" buildVimPlugin; # used to figure out which python dependencies etc. neovim needs requiredPlugins = { diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim b/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim index 0ddbeaae6be1..f6160795c5c8 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim @@ -50,7 +50,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'-'.date.'";', \ ' src = fetchgit {', \ ' url = "'. a:repository.url .'";', @@ -74,7 +74,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchhg {', \ ' url = "'. a:repository.url .'";', @@ -99,7 +99,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = keys(get(addon_info, 'dependencies', {})) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchurl {', \ ' url = "'. a:repository.url .'";', diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 1f5d14282d20..c0d3415713fc 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -343,11 +343,16 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.97"; - sha256 = "sha256-rNGW8WB3jBSjThiB0j4/ORKMRAaxFiMiBfaa+dbGu/w="; + version = "0.8.2"; + sha256 = "0kw9asv91s37ql61blbb8pr7wb6c2ba1klchal53chp6ib55v5kn"; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; + description = "Vim-mode for VS Code using embedded Neovim"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=asvetliakov.vscode-neovim"; license = lib.licenses.mit; + homepage = "https://github.com/vscode-neovim/vscode-neovim"; + maintainers = [ lib.maintainers.mikaelfangel ]; }; }; @@ -700,8 +705,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.38.0"; - sha256 = "sha256-Gcw+X8e8MrTflotHUwkrdP/DD/6AX/kEgtRiqvqyqRM="; + version = "2023.40.0"; + sha256 = "sha256-Ym76WtKvz18NgxH9o8O/Ozn+/AtqLvjJs8ffLhPOWkQ="; }; meta = { license = lib.licenses.mit; @@ -727,8 +732,8 @@ let mktplcRef = { name = "chatgpt-reborn"; publisher = "chris-hayes"; - version = "3.16.3"; - sha256 = "wkitG5gmYKYKXRw/zVW04HN1dePiTjbnynFOY/bwxfI="; + version = "3.19.1"; + sha256 = "1msb3lqy9p2v26nsw0clfsisiwxcid3jp1l6549hk1i1gcqhd84w"; }; }; @@ -736,8 +741,8 @@ let mktplcRef = { name = "path-intellisense"; publisher = "christian-kohler"; - version = "2.8.4"; - sha256 = "sha256-FEBYcjJHOwmxVHhhyxqOpk/V6hvtMkhkvLVpmJCMSZw="; + version = "2.8.5"; + sha256 = "1ndffv1m4ayiija1l42m28si44vx9y6x47zpxzqv2j4jj7ga1n5z"; }; meta = { description = "Visual Studio Code plugin that autocompletes filenames"; @@ -896,8 +901,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.51.0"; - sha256 = "sha256-Xtr8cqcPrcrKpJBxQcY1j9Gl4CC6U3ZazS4bdBtdzUk="; + version = "0.52.0"; + sha256 = "sha256-Y8qkcNEvJ/yzT8PDeErRzKGxYBNKKfbNNsJVaFDeIV4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1224,8 +1229,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.16.0"; - sha256 = "sha256-PZUyOZ/U6OkGid+PYY2G/pAe5R5eumUibKNel9HBI+s="; + version = "0.17.1"; + sha256 = "sha256-WBtIdz+8zsyTl43ovU3Dz+8p154ZGvHp6BA3AQtXN/U="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1400,8 +1405,8 @@ let mktplcRef = { name = "vscode-firefox-debug"; publisher = "firefox-devtools"; - version = "2.9.8"; - sha256 = "sha256-MCL562FPgEfhUM1KH5LMl7BblbjIkQ4UEwB67RlO5Mk="; + version = "2.9.10"; + sha256 = "sha256-xuvlE8L/qjOn8Qhkv9sutn/xRbwC9V/IIfEr4Ixm1vA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/firefox-devtools.vscode-firefox-debug/changelog"; @@ -1570,9 +1575,10 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.89.156"; - sha256 = "sha256-BJnYd9D3bWrZI8UETnAua8ngVjZJ7EXB1UrZAjVnx1E="; + version = "1.126.493"; + sha256 = "1an7z8z3xz2piw2xz1hdrs6l5rhpyvnjmb650ff2m4k24n01svfy"; }; + meta = { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; @@ -1640,8 +1646,8 @@ let # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they can require insider versions # of VS Code - version = "0.68.1"; - sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI="; + version = "0.75.2023101209"; + sha256 = "1saz4brd5k1wyy7pz1h3jcl4kq35f78s2q8drjd7v2k97jhy8la1"; }; meta = { license = lib.licenses.mit; }; }; @@ -1886,8 +1892,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.10.0"; - sha256 = "s0+8952svPSA69M4H29zuIxUWV6xNRpIqLNd8pzGJhY="; + version = "9.14.1"; + sha256 = "1a8im7n25jy2zyqcqhscj62bamhwzp6kk6hdarb0p38d4pwwzxbm"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -2356,9 +2362,10 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.14.0"; - sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs="; + version = "0.15.2"; + sha256 = "06lp4qgnksklgc6nvx1l9z38y7apbx0a6v886nd15aq9rq8my0ka"; }; + meta = { description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; @@ -2721,12 +2728,15 @@ let }; }; + nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; publisher = "nvarner"; - version = "0.5.0"; - sha256 = "sha256-4bZbjbcd/EjSRBMkzMs1pD00qyQb5W6gePh4xfoU6Ug="; + # Please update the corresponding binary (typst-lsp) when updating + # this extension. + version = "0.10.1"; + sha256 = "sha256-+LOw9JPpL5eLNxmP4kyPo9S/w8ZxfPGSaY1oR8THmvI="; }; nativeBuildInputs = [ jq moreutils ]; @@ -2827,8 +2837,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.29.0"; - sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM="; + version = "4.31.0"; + sha256 = "0rn4dyqr46wbgi4k27ni6a6i3pa83gyaprhds5rlndjaw90iakb4"; }; meta = { license = lib.licenses.mit; @@ -2893,8 +2903,8 @@ let mktplcRef = { name = "vscode-xml"; publisher = "redhat"; - version = "0.25.2023032304"; - sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; + version = "0.26.2023092519"; + sha256 = "00p98qihw7ndwl4h18jx8n0lmrqsn1vab7h2k3cbjdz0b623j773"; }; meta.license = lib.licenses.epl20; }; @@ -2903,8 +2913,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.12.0"; - sha256 = "sha256-r/me14KonxnQeensIYyWU4dQrhomc8h2ntYoiZ+Y7jE="; + version = "1.14.0"; + sha256 = "0pww9qndd2vsizsibjsvscz9fbfx8srrj67x4vhmwr581q674944"; }; meta = { license = lib.licenses.mit; @@ -3334,8 +3344,8 @@ let mktplcRef = { name = "vscode-tailscale"; publisher = "tailscale"; - version = "0.4.0"; - sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs="; + version = "0.6.4"; + sha256 = "1jcq5kdcdyb5yyy0p9cnv56vmclvb6wdwq8xvy1qbkfdqbmy05gm"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog"; @@ -3507,6 +3517,22 @@ let }; }; + uiua-lang.uiua-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "uiua-vscode"; + publisher = "uiua-lang"; + version = "0.0.19"; + sha256 = "sha256-Tww1urq6CfLma254Sn5lwOYwbvxAeDZuBuFBQlzks1c="; + }; + meta = { + description = "VSCode language extension for Uiua"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; + homepage = "https://github.com/uiua-lang/uiua-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-mdx"; @@ -3527,8 +3553,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.12.0"; - sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4="; + version = "3.14.0"; + sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -3693,8 +3719,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.25.2"; - sha256 = "sha256-hy2Ks6oRc9io6vfgql9aFGjUiRzBCS4mGdDO3NqIFEg="; + version = "1.26.1"; + sha256 = "sha256-zshuABicdkT52Nqj1L2RrfMziBRgO+R15fM32SCnyXI="; }; meta = { license = lib.licenses.mit; @@ -3729,8 +3755,8 @@ let mktplcRef = { name = "gitblame"; publisher = "waderyan"; - version = "10.1.0"; - sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0="; + version = "10.5.1"; + sha256 = "119rf52xnxz0cwvvjjfc5m5iv19288cxz33xzr79b67wyfd79hl9"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; @@ -3867,8 +3893,8 @@ let mktplcRef = { name = "material-theme"; publisher = "zhuangtongfa"; - version = "3.15.8"; - sha256 = "sha256-PwWGs9KRfV3qpYbgdiw8FYvnkaJQ2VW2H6p6+umk7eg="; + version = "3.16.2"; + sha256 = "0ava94zn68lxy3ph78r5rma39qz03al5l5i6x070mpa1hzj3i319"; }; meta = { license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh b/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 6fff7454493a..17fe10604340 100755 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq unzip +#! nix-shell -i bash -p cacert curl jq unzip # shellcheck shell=bash set -eu -o pipefail diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 39e4fbc966d7..693ffb4e9441 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -1,164 +1,55 @@ -{ stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages -, atomEnv, at-spi2-atk, autoPatchelfHook -, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland -, libglvnd, libkrb5 - -# Populate passthru.tests +{ stdenv +, lib +, makeDesktopItem +, unzip +, libsecret +, libXScrnSaver +, libxshmfence +, buildPackages +, at-spi2-atk +, autoPatchelfHook +, alsa-lib +, mesa +, nss +, nspr +, xorg +, systemd +, fontconfig +, libdbusmenu +, glib +, buildFHSEnv +, wayland +, libglvnd +, libkrb5 + + # Populate passthru.tests , tests -# needed to fix "Save as Root" -, asar, bash - -# Attributes inherit from specific versions -, version, src, meta, sourceRoot, commandLineArgs -, executableName, longName, shortName, pname, updateScript + # needed to fix "Save as Root" +, asar +, bash + + # Attributes inherit from specific versions +, version +, src +, meta +, sourceRoot +, commandLineArgs +, executableName +, longName +, shortName +, pname +, updateScript , dontFixup ? false -, rev ? null, vscodeServer ? null +, rev ? null +, vscodeServer ? null , sourceExecutableName ? executableName , useVSCodeRipgrep ? false , ripgrep }: +stdenv.mkDerivation (finalAttrs: let - unwrapped = stdenv.mkDerivation { - - inherit pname version src sourceRoot dontFixup; - - passthru = { - inherit executableName longName tests updateScript; - fhs = fhs {}; - fhsWithPackages = f: fhs { additionalPkgs = f; }; - } // lib.optionalAttrs (vscodeServer != null) { - inherit rev vscodeServer; - }; - - desktopItem = makeDesktopItem { - name = executableName; - desktopName = longName; - comment = "Code Editing. Redefined."; - genericName = "Text Editor"; - exec = "${executableName} %F"; - icon = "vs${executableName}"; - startupNotify = true; - startupWMClass = shortName; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "inode/directory" ]; - keywords = [ "vscode" ]; - actions.new-empty-window = { - name = "New Empty Window"; - exec = "${executableName} --new-window %F"; - icon = "vs${executableName}"; - }; - }; - - urlHandlerDesktopItem = makeDesktopItem { - name = executableName + "-url-handler"; - desktopName = longName + " - URL Handler"; - comment = "Code Editing. Redefined."; - genericName = "Text Editor"; - exec = executableName + " --open-url %U"; - icon = "vs${executableName}"; - startupNotify = true; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/vscode" ]; - keywords = [ "vscode" ]; - noDisplay = true; - }; - - buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); - - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; - - nativeBuildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook - asar - # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) - ]; - - dontBuild = true; - dontConfigure = true; - noDumpEnvVars = true; - - installPhase = '' - runHook preInstall - '' + (if stdenv.isDarwin then '' - mkdir -p "$out/Applications/${longName}.app" "$out/bin" - cp -r ./* "$out/Applications/${longName}.app" - ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" - '' else '' - mkdir -p "$out/lib/vscode" "$out/bin" - cp -r ./* "$out/lib/vscode" - - ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}" - - mkdir -p "$out/share/applications" - ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" - ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" - - # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. - mkdir -p "$out/share/pixmaps" - cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" - - # Override the previously determined VSCODE_PATH with the one we know to be correct - sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" - grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded - - # Remove native encryption code, as it derives the key from the executable path which does not work for us. - # The credentials should be stored in a secure keychain already, so the benefit of this is questionable - # in the first place. - rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt - '') + '' - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Add gio to PATH so that moving files to the trash works when not using a desktop environment - --prefix PATH : ${glib.bin}/bin - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - --add-flags ${lib.escapeShellArg commandLineArgs} - ) - ''; - - # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 - # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 - postPatch = lib.optionalString stdenv.isLinux '' - # this is a fix for "save as root" functionality - packed="resources/app/node_modules.asar" - unpacked="resources/app/node_modules" - asar extract "$packed" "$unpacked" - substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ - --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ - --replace "/bin/bash" "${bash}/bin/bash" - rm -rf "$packed" - - # without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true, - # fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet' - # and the window immediately closes which renders VSCode unusable - # see https://github.com/NixOS/nixpkgs/issues/152939 for full log - ln -rs "$unpacked" "$packed" - '' + (let - vscodeRipgrep = if stdenv.isDarwin then - "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" - else - "resources/app/node_modules/@vscode/ripgrep/bin/rg"; - in if !useVSCodeRipgrep then '' - rm ${vscodeRipgrep} - ln -s ${ripgrep}/bin/rg ${vscodeRipgrep} - '' else '' - chmod +x ${vscodeRipgrep} - ''); - - postFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} - ''; - - inherit meta; - }; # Vscode and variants allow for users to download and use extensions # which often include the usage of pre-built binaries. @@ -169,7 +60,7 @@ let # # buildFHSEnv allows for users to use the existing vscode # extension tooling without significant pain. - fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnv { + fhs = { additionalPkgs ? pkgs: [ ] }: buildFHSEnv { # also determines the name of the wrapped command name = executableName; @@ -197,10 +88,10 @@ let # symlink shared assets, including icons and desktop entries extraInstallCommands = '' - ln -s "${unwrapped}/share" "$out/" + ln -s "${finalAttrs.finalPackage}/share" "$out/" ''; - runScript = "${unwrapped}/bin/${executableName}"; + runScript = "${finalAttrs.finalPackage}/bin/${executableName}"; # vscode likes to kill the parent so that the # gui application isn't attached to the terminal session @@ -208,7 +99,7 @@ let passthru = { inherit executableName; - inherit (unwrapped) pname version; # for home-manager module + inherit (finalAttrs.finalPackage) pname version; # for home-manager module }; meta = meta // { @@ -219,4 +110,145 @@ let }; }; in - unwrapped +{ + + inherit pname version src sourceRoot dontFixup; + + passthru = { + inherit executableName longName tests updateScript; + fhs = fhs { }; + fhsWithPackages = f: fhs { additionalPkgs = f; }; + } // lib.optionalAttrs (vscodeServer != null) { + inherit rev vscodeServer; + }; + + desktopItem = makeDesktopItem { + name = executableName; + desktopName = longName; + comment = "Code Editing. Redefined."; + genericName = "Text Editor"; + exec = "${executableName} %F"; + icon = "vs${executableName}"; + startupNotify = true; + startupWMClass = shortName; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" ]; + keywords = [ "vscode" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "${executableName} --new-window %F"; + icon = "vs${executableName}"; + }; + }; + + urlHandlerDesktopItem = makeDesktopItem { + name = executableName + "-url-handler"; + desktopName = longName + " - URL Handler"; + comment = "Code Editing. Redefined."; + genericName = "Text Editor"; + exec = executableName + " --open-url %U"; + icon = "vs${executableName}"; + startupNotify = true; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/vscode" ]; + keywords = [ "vscode" ]; + noDisplay = true; + }; + + buildInputs = [ libsecret libXScrnSaver libxshmfence ] + ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; + + runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; + + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + asar + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) + ]; + + dontBuild = true; + dontConfigure = true; + noDumpEnvVars = true; + + installPhase = '' + runHook preInstall + '' + (if stdenv.isDarwin then '' + mkdir -p "$out/Applications/${longName}.app" "$out/bin" + cp -r ./* "$out/Applications/${longName}.app" + ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" + '' else '' + mkdir -p "$out/lib/vscode" "$out/bin" + cp -r ./* "$out/lib/vscode" + + ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}" + + mkdir -p "$out/share/applications" + ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" + ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" + + # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. + mkdir -p "$out/share/pixmaps" + cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" + + # Override the previously determined VSCODE_PATH with the one we know to be correct + sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" + grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded + + # Remove native encryption code, as it derives the key from the executable path which does not work for us. + # The credentials should be stored in a secure keychain already, so the benefit of this is questionable + # in the first place. + rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt + '') + '' + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Add gio to PATH so that moving files to the trash works when not using a desktop environment + --prefix PATH : ${glib.bin}/bin + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags ${lib.escapeShellArg commandLineArgs} + ) + ''; + + # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 + # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 + postPatch = lib.optionalString stdenv.isLinux '' + # this is a fix for "save as root" functionality + packed="resources/app/node_modules.asar" + unpacked="resources/app/node_modules" + asar extract "$packed" "$unpacked" + substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ + --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ + --replace "/bin/bash" "${bash}/bin/bash" + rm -rf "$packed" + + # without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true, + # fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet' + # and the window immediately closes which renders VSCode unusable + # see https://github.com/NixOS/nixpkgs/issues/152939 for full log + ln -rs "$unpacked" "$packed" + '' + ( + let + vscodeRipgrep = + if stdenv.isDarwin then + "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" + else + "resources/app/node_modules/@vscode/ripgrep/bin/rg"; + in + if !useVSCodeRipgrep then '' + rm ${vscodeRipgrep} + ln -s ${ripgrep}/bin/rg ${vscodeRipgrep} + '' else '' + chmod +x ${vscodeRipgrep} + '' + ); + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} + ''; + + inherit meta; +}) diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 884aca67823b..185847e28028 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0i6zk4zkwcw5lnzhg7vvnsw17nar97bbq3iishag9cpjqs9jpq4z"; - x86_64-darwin = "1sy0ir4mhw9j5ifiv6d2928gcs8wfksxlsp312r9nsmc2h0i11g6"; - aarch64-linux = "13lsycmia9yj6s7zf441vg8c0pipxpxdrnrj7v4rhjlvixjb8f8k"; - aarch64-darwin = "1qwmwx0q05lzhsb8810kjk1lcw4wm7cr0zn7pkyjlsda0vkcc5g8"; - armv7l-linux = "1hlnd9w141phrd3mzkhgiskbcnxqb05396frrv38pns007xhj103"; + x86_64-linux = "1061hpazgs2gbn1xbn3in1sh7img71l5fx1irlgr86k70jdjw0qp"; + x86_64-darwin = "17n16az3b8lnh1wq7mj4fd2kvvbh3l4d72iwxqx2z08vpsiaivad"; + aarch64-linux = "0ggjh58nxwz5hlv4hwig2w32lcg2vsvszsr7dq6p7rd3c7l13mqr"; + aarch64-darwin = "0irvjlzx79a2p8jbv8kiblkrzkslpv6qmqzi5yj7gl2dl2f5y1lx"; + armv7l-linux = "1nyaz1nmswyy6qkz83cqb8nw1ajlhchqcwbj5msq3camkjdjr8g6"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.82.2"; + version = "1.83.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "abd2f3db4bdb28f9e95536dfa84d8479f1eb312d"; + rev = "f1b07bd25dfad64b0167beb15359ae573aecd2cc"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1d1ypmasr7zj4csinb5nj531ckj7a1pgn36469fdzwn0xjrgkg16"; + sha256 = "0hbqbkzynqxp99rhqq46878cp1jnjklqy8vgbf0dm2cwfw86jbrw"; }; }; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index f7527096f17a..c34629a3cf67 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3"; - x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj"; - aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v"; - aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5"; - armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn"; + x86_64-linux = "0cqkxd4pywkrvg3b96f1dyain6vlrb3di8a0yskmq3h58qd6k8rc"; + x86_64-darwin = "09y3whpp2z8fgb42pb9lw0b4wn0np3rdjkn5l1kldjljfrcwcn9g"; + aarch64-linux = "1kh8qylj77km8jhmx9a2bck7y4bb0fjx46sll7swagxz27b8ahi0"; + aarch64-darwin = "14g60sx3c5m02ly880sxwhmzvpxqw4pfij2ibgyprzdlpap0r2b0"; + armv7l-linux = "1s4rpd5p4kwmi89cml1106l9dccdwnqq3lyr8ym781pj9p75i8wp"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.82.2.23257"; + version = "1.83.1.23285"; pname = "vscodium"; executableName = "codium"; |