diff options
Diffstat (limited to 'pkgs/applications')
119 files changed, 4371 insertions, 2707 deletions
diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/applications/audio/castopod/default.nix new file mode 100644 index 000000000000..9d9f83e2ecce --- /dev/null +++ b/pkgs/applications/audio/castopod/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, ffmpeg-headless +, lib +, nixosTests +, stateDirectory ? "/var/lib/castopod" +}: +stdenv.mkDerivation { + pname = "castopod"; + version = "1.6.4"; + + src = fetchurl { + url = "https://code.castopod.org/adaures/castopod/uploads/ce56d4f149242f12bedd20f9a2b0916d/castopod-1.6.4.tar.gz"; + sha256 = "080jj91yxbn3xsbs0sywzwa2f5in9bp9qi2zwqcfqpaxlq9ga62v"; + }; + + dontBuild = true; + dontFixup = true; + + postPatch = '' + # not configurable at runtime unfortunately: + substituteInPlace app/Config/Paths.php \ + --replace "__DIR__ . '/../../writable'" "'${stateDirectory}/writable'" + + # configuration file must be writable, place it to ${stateDirectory} + substituteInPlace modules/Install/Controllers/InstallController.php \ + --replace "ROOTPATH" "'${stateDirectory}/'" + substituteInPlace public/index.php spark \ + --replace "DotEnv(ROOTPATH)" "DotEnv('${stateDirectory}')" + + # ffmpeg is required for Video Clips feature + substituteInPlace modules/MediaClipper/VideoClipper.php \ + --replace "ffmpeg" "${ffmpeg-headless}/bin/ffmpeg" + substituteInPlace modules/Admin/Controllers/VideoClipsController.php \ + --replace "which ffmpeg" "echo ${ffmpeg-headless}/bin/ffmpeg" + ''; + + installPhase = '' + mkdir -p $out/share/castopod + cp -r . $out/share/castopod + ''; + + passthru.tests.castopod = nixosTests.castopod; + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "An open-source hosting platform made for podcasters who want to engage and interact with their audience"; + homepage = "https://castopod.org"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ alexoundos misuzu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/castopod/update.sh b/pkgs/applications/audio/castopod/update.sh new file mode 100755 index 000000000000..742788dc8ddf --- /dev/null +++ b/pkgs/applications/audio/castopod/update.sh @@ -0,0 +1,89 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +castopod_nix="$nixpkgs/pkgs/applications/audio/castopod/default.nix" + +# https://www.meetup.com/api/guide/#p02-querying-section +query=' +query allReleases($fullPath: ID!, $first: Int, $last: Int, $before: String, $after: String, $sort: ReleaseSort) { + project(fullPath: $fullPath) { + id + releases( + first: $first + last: $last + before: $before + after: $after + sort: $sort + ) { + nodes { + ...Release + __typename + } + __typename + } + __typename + } +} + +fragment Release on Release { + id + name + tagName + releasedAt + createdAt + upcomingRelease + historicalRelease + assets { + links { + nodes { + id + name + url + directAssetUrl + linkType + __typename + } + __typename + } + __typename + } + __typename +} +' +variables='{ + "fullPath": "adaures/castopod", + "first": 1, + "sort": "RELEASED_AT_DESC" +}' + +post=$(cat <<EOF +{"query": "$(echo $query)", "variables": $(echo $variables)} +EOF +) + +json="$(curl -s -X POST https://code.castopod.org/api/graphql \ + -H 'Content-Type: application/json' \ + -d "$post")" + +echo "$json" +TAG=$(echo $json | jq -r '.data.project.releases.nodes[].tagName') +ASSET_URL=$(echo $json | jq -r '.data.project.releases.nodes[].assets.links.nodes[].url' | grep .tar.gz$) + +CURRENT_VERSION=$(nix eval -f "$nixpkgs" --raw castopod.version) +VERSION=${TAG:1} + +if [[ "$CURRENT_VERSION" == "$VERSION" ]]; then + echo "castopod is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + +SHA256=$(nix-prefetch-url "$ASSET_URL") + +URL=$(echo $ASSET_URL | sed -e 's/[\/&]/\\&/g') + +sed -e "s/version =.*;/version = \"$VERSION\";/g" \ + -e "s/url =.*;/url = \"$URL\";/g" \ + -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ + -i "$castopod_nix" diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index d2ccb6d47472..b277175ec102 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_BUILD_TYPE=Release" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index cf8cf47a35f7..935c277597fc 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "12.0.1"; + version = "12.0.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tkkaBIWoQS28FsCSN5CKw2ZQ3cbYa34PVZCUGaaqaQo="; + sha256 = "sha256-7jE3erxrCPN2deI7EV0gDH1gy2XdwC1YdU2mo2xMI6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 87f1e1512954..91e043a59346 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.3"; + version = "1.25.5"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-drv+QNBmUjvlRul8PlFK4ZBIDw6BV4kJXVw287H6WT4="; + hash = "sha256-N0bL/kgw5tIVcD4fGYrahdola/w9ouct0+AUqw+dUOg="; }; # Remove some Electron stuff from package.json @@ -16,7 +16,7 @@ buildNpmPackage rec { sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json ''; - npmDepsHash = "sha256-M+6+zrxy8VpJQS0dG/xORMbflKEq8wO2DEOjGrA6OUw="; + npmDepsHash = "sha256-unjoBWVwmUqxAU3mDC37sXzoh7aEOdny4Asa70+sZnk="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 05957bf38f2b..4f203a77dc86 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity' ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DSFIZZ_TESTS=ON" ]; + cmakeFlags = [ "-DSFIZZ_TESTS=ON" ]; doCheck = true; diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 65a921ed5bf2..d302643eb47d 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=" ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index cbb229066175..239d03268245 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.11.916.geb595a67"; + version = "1.2.13.661.ga588f749"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "67"; + rev = "68"; deps = [ alsa-lib @@ -84,7 +84,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-PVqf2oigdqIrttC2tYYzSGXwOk6FLKjgIkaOPdNSCoHeoxRyHiblS6kwlgPgj2ZYjwBe6JcOc+zL+AX/cOidyg=="; + hash = "sha512-THGSRx0sGOVEB6bOHWHiy1G0Acq0hUa94tG/v+i5DA+CluI58pqj8gYQ61k/ACLJXTUyM8SA92C8DK1Go18X8w=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 13928c856b99..7928a63b8264 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" ]; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 49817edd170d..96e493131dd8 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iCLOrf6/f0f7sD0YjmBtlcOcZRDIp9IZkBadTKj1Qjw="; + sha256 = "sha256-tomzF0jM1tcxnnBHLfNWcR1XGECxU8Q/SQAWQBRAFW8="; }; - vendorHash = "sha256-ChmQjhz4dQdwcY/269Hi5XAn8/+0z/AF7Kd9PJ8WqHg="; + vendorHash = "sha256-VX2S7yjdcconPd8wisV+Cl6FVuEUGU7smIBKfTxpUVY="; doCheck = false; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 2bc3a683ef50..066bbde363ac 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 4d07a964af18..0dc220ac66dc 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix index a57e38ac9cfa..5c8cbbbbcdd5 100644 --- a/pkgs/applications/blockchains/oxen/default.nix +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" # "-DUSE_DEVICE_TREZOR=ON" # "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index cbd63c0ffcd0..fde2bebe5e4e 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles +, stdenv }: buildGoModule rec { pname = "glow"; @@ -19,6 +21,14 @@ buildGoModule rec { 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/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index efc939d0324f..2d6cbf5b8720 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -11,6 +11,7 @@ , unzip , libsecret , libnotify +, udev , e2fsprogs , python3 , vmopts ? null @@ -109,6 +110,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs libnotify + # Required for Help -> Collect Logs + # in at least rider and goland + udev ] ++ extraLdPath)}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ --set-default JDK_HOME "$jdk" \ diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 4d8dc4d58dc5..f82ee11c3f88 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; - hash = "sha256-/EFmuzj8hYhQJegZpZhZb4fuSeMF9wdG1Be4duEvW54="; + hash = "sha256-WuKzhE9r/yMqlV2bf/0AuNVKfxq/SlecmN3rHt6RjXo="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 41b9d0b1f9da..4c3fefad7fd3 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.64.3"; + version = "2.65.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-mx6k6OXr3iTCD1FTC7J1fnz7Gs/GyggHXnVywuPo5BY="; + hash = "sha256-ul5E5xOtH5qh5tNE+S/VhUOr079wHwgtXF7ZIAwGzgU="; }; vendorHash = null; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index e854291310b8..a619c636cd53 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -115,7 +115,6 @@ in cmakeFlags = [ "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}" - "-DCMAKE_BUILD_TYPE=Release" "-DRSTUDIO_USE_SYSTEM_SOCI=ON" "-DRSTUDIO_USE_SYSTEM_BOOST=ON" "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index ab59232d859e..59c79721a6ef 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/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/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0abb7db9d99d..0179dabe3945 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1811"; + version = "9.0.1897"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-b/fATWaHcIZIvkmr/UQ4R45ii9N0kWJMb7DerF/JYIA="; + hash = "sha256-ywxJ9evXWbqZ6o6EqDIQWK16J05McAdvPl0Y9cW5Zvc="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 20641908115c..1611adc97ee3 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/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/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index cf35e31736ee..e557cd7effe3 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/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/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 40a7667ea1e0..b2f489c0bbde 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/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,7 +27,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; - ChatGPT-nvim = buildVimPluginFrom2Nix { + ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -39,7 +39,7 @@ final: prev: 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,7 +63,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; }; - Coqtail = buildVimPluginFrom2Nix { + Coqtail = buildVimPlugin { pname = "Coqtail"; version = "2023-08-05"; src = fetchFromGitHub { @@ -75,7 +75,7 @@ final: prev: 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,7 +171,7 @@ final: prev: meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; }; - LazyVim = buildVimPluginFrom2Nix { + LazyVim = buildVimPlugin { pname = "LazyVim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -183,7 +183,7 @@ final: prev: meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; - LeaderF = buildVimPluginFrom2Nix { + LeaderF = buildVimPlugin { pname = "LeaderF"; version = "2023-09-15"; src = fetchFromGitHub { @@ -195,7 +195,7 @@ final: prev: 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,7 +303,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; - SchemaStore-nvim = buildVimPluginFrom2Nix { + SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; version = "2023-09-15"; src = fetchFromGitHub { @@ -315,7 +315,7 @@ final: prev: 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,7 +375,7 @@ final: prev: meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; - SpaceVim = buildVimPluginFrom2Nix { + SpaceVim = buildVimPlugin { pname = "SpaceVim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -387,7 +387,7 @@ final: prev: 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,7 +447,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; }; - YouCompleteMe = buildVimPluginFrom2Nix { + YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; version = "2023-09-14"; src = fetchFromGitHub { @@ -460,7 +460,7 @@ final: prev: 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,7 +520,7 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; }; - aerial-nvim = buildVimPluginFrom2Nix { + aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -533,7 +533,7 @@ final: prev: 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,7 +557,7 @@ final: prev: meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; - ai-vim = buildVimPluginFrom2Nix { + ai-vim = buildVimPlugin { pname = "ai.vim"; version = "2023-04-05"; src = fetchFromGitHub { @@ -569,7 +569,7 @@ final: prev: meta.homepage = "https://github.com/aduros/ai.vim/"; }; - alchemist-vim = buildVimPluginFrom2Nix { + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "2023-09-01"; src = fetchFromGitHub { @@ -581,7 +581,7 @@ final: prev: meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; - ale = buildVimPluginFrom2Nix { + ale = buildVimPlugin { pname = "ale"; version = "2023-09-16"; src = fetchFromGitHub { @@ -593,7 +593,7 @@ final: prev: 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,7 +773,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; - asyncrun-vim = buildVimPluginFrom2Nix { + asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; version = "2023-08-20"; src = fetchFromGitHub { @@ -785,7 +785,7 @@ final: prev: meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; - asynctasks-vim = buildVimPluginFrom2Nix { + asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -797,7 +797,7 @@ final: prev: meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; - ats-vim = buildVimPluginFrom2Nix { + ats-vim = buildVimPlugin { pname = "ats-vim"; version = "2020-09-04"; src = fetchFromGitHub { @@ -809,7 +809,7 @@ final: prev: meta.homepage = "https://github.com/vmchale/ats-vim/"; }; - aurora = buildVimPluginFrom2Nix { + aurora = buildVimPlugin { pname = "aurora"; version = "2023-09-09"; src = fetchFromGitHub { @@ -821,7 +821,7 @@ final: prev: 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,7 +989,7 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; - base46 = buildVimPluginFrom2Nix { + base46 = buildVimPlugin { pname = "base46"; version = "2023-09-14"; src = fetchFromGitHub { @@ -1001,7 +1001,7 @@ final: prev: 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,7 +1061,7 @@ final: prev: meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; - blamer-nvim = buildVimPluginFrom2Nix { + blamer-nvim = buildVimPlugin { pname = "blamer.nvim"; version = "2021-11-17"; src = fetchFromGitHub { @@ -1073,7 +1073,7 @@ final: prev: meta.homepage = "https://github.com/APZelos/blamer.nvim/"; }; - block-nvim = buildVimPluginFrom2Nix { + block-nvim = buildVimPlugin { pname = "block.nvim"; version = "2023-06-22"; src = fetchFromGitHub { @@ -1085,7 +1085,7 @@ final: prev: 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,7 +1169,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; }; - bufferline-nvim = buildVimPluginFrom2Nix { + bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; version = "2023-08-29"; src = fetchFromGitHub { @@ -1181,7 +1181,7 @@ final: prev: 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,7 +1241,7 @@ final: prev: meta.homepage = "https://github.com/tyru/caw.vim/"; }; - ccc-nvim = buildVimPluginFrom2Nix { + ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; version = "2023-06-12"; src = fetchFromGitHub { @@ -1253,7 +1253,7 @@ final: prev: meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; - chadtree = buildVimPluginFrom2Nix { + chadtree = buildVimPlugin { pname = "chadtree"; version = "2023-09-05"; src = fetchFromGitHub { @@ -1265,7 +1265,7 @@ final: prev: 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,7 +1325,7 @@ 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"; src = fetchFromGitHub { @@ -1337,7 +1337,7 @@ final: prev: 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,7 +1745,7 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; - cmp-omni = buildVimPluginFrom2Nix { + cmp-omni = buildVimPlugin { pname = "cmp-omni"; version = "2023-05-25"; src = fetchFromGitHub { @@ -1757,7 +1757,7 @@ final: prev: 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,7 +1805,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; - cmp-snippy = buildVimPluginFrom2Nix { + cmp-snippy = buildVimPlugin { pname = "cmp-snippy"; version = "2023-06-15"; src = fetchFromGitHub { @@ -1817,7 +1817,7 @@ final: prev: meta.homepage = "https://github.com/dcampos/cmp-snippy/"; }; - cmp-spell = buildVimPluginFrom2Nix { + cmp-spell = buildVimPlugin { pname = "cmp-spell"; version = "2022-10-10"; src = fetchFromGitHub { @@ -1829,7 +1829,7 @@ final: prev: 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,7 +1853,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; - cmp-treesitter = buildVimPluginFrom2Nix { + cmp-treesitter = buildVimPlugin { pname = "cmp-treesitter"; version = "2023-04-06"; src = fetchFromGitHub { @@ -1865,7 +1865,7 @@ final: prev: 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,7 +1925,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/cmp-zsh/"; }; - cmp_luasnip = buildVimPluginFrom2Nix { + cmp_luasnip = buildVimPlugin { pname = "cmp_luasnip"; version = "2022-10-28"; src = fetchFromGitHub { @@ -1937,7 +1937,7 @@ final: prev: 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,7 +1997,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-svelte = buildVimPluginFrom2Nix { + coc-svelte = buildVimPlugin { pname = "coc-svelte"; version = "2022-03-14"; src = fetchFromGitHub { @@ -2009,7 +2009,7 @@ final: prev: 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,7 +2021,7 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; }; - coc-nvim = buildVimPluginFrom2Nix { + coc-nvim = buildVimPlugin { pname = "coc.nvim"; version = "2023-09-15"; src = fetchFromGitHub { @@ -2033,7 +2033,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; - coconut-vim = buildVimPluginFrom2Nix { + coconut-vim = buildVimPlugin { pname = "coconut.vim"; version = "2017-10-10"; src = fetchFromGitHub { @@ -2045,7 +2045,7 @@ final: prev: meta.homepage = "https://github.com/manicmaniac/coconut.vim/"; }; - codeium-vim = buildVimPluginFrom2Nix { + codeium-vim = buildVimPlugin { pname = "codeium.vim"; version = "2023-09-15"; src = fetchFromGitHub { @@ -2057,7 +2057,7 @@ final: prev: meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; - codewindow-nvim = buildVimPluginFrom2Nix { + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -2069,7 +2069,7 @@ final: prev: 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,7 +2105,7 @@ 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"; src = fetchFromGitHub { @@ -2117,7 +2117,7 @@ final: prev: meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; - command-t = buildVimPluginFrom2Nix { + command-t = buildVimPlugin { pname = "command-t"; version = "2023-08-07"; src = fetchFromGitHub { @@ -2129,7 +2129,7 @@ final: prev: 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,7 +2333,7 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; - copilot-lua = buildVimPluginFrom2Nix { + copilot-lua = buildVimPlugin { pname = "copilot.lua"; version = "2023-09-04"; src = fetchFromGitHub { @@ -2345,7 +2345,7 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; - copilot-vim = buildVimPluginFrom2Nix { + copilot-vim = buildVimPlugin { pname = "copilot.vim"; version = "2023-09-02"; src = fetchFromGitHub { @@ -2357,7 +2357,7 @@ final: prev: 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,7 +2393,7 @@ final: prev: meta.homepage = "https://github.com/jvoorhis/coq.vim/"; }; - coq_nvim = buildVimPluginFrom2Nix { + coq_nvim = buildVimPlugin { pname = "coq_nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -2405,7 +2405,7 @@ final: prev: 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,7 +2429,7 @@ final: prev: meta.homepage = "https://github.com/nixprime/cpsm/"; }; - crates-nvim = buildVimPluginFrom2Nix { + crates-nvim = buildVimPlugin { pname = "crates.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -2441,7 +2441,7 @@ final: prev: 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,7 +2465,7 @@ 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"; src = fetchFromGitHub { @@ -2477,7 +2477,7 @@ final: prev: 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,7 +2549,7 @@ final: prev: meta.homepage = "https://github.com/rizzatti/dash.vim/"; }; - dashboard-nvim = buildVimPluginFrom2Nix { + dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; version = "2023-09-09"; src = fetchFromGitHub { @@ -2561,7 +2561,7 @@ final: prev: 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,7 +2935,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; - dial-nvim = buildVimPluginFrom2Nix { + dial-nvim = buildVimPlugin { pname = "dial.nvim"; version = "2023-09-09"; src = fetchFromGitHub { @@ -2947,7 +2947,7 @@ final: prev: meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; - diffview-nvim = buildVimPluginFrom2Nix { + diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; version = "2023-08-21"; src = fetchFromGitHub { @@ -2959,7 +2959,7 @@ final: prev: 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,7 +3019,7 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; - dressing-nvim = buildVimPluginFrom2Nix { + dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -3031,7 +3031,7 @@ final: prev: meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; - dropbar-nvim = buildVimPluginFrom2Nix { + dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -3043,7 +3043,7 @@ final: prev: 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,7 +3079,7 @@ final: prev: meta.homepage = "https://github.com/edgedb/edgedb-vim/"; }; - edgy-nvim = buildVimPluginFrom2Nix { + edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; version = "2023-07-25"; src = fetchFromGitHub { @@ -3091,7 +3091,7 @@ final: prev: meta.homepage = "https://github.com/folke/edgy.nvim/"; }; - editorconfig-vim = buildVimPluginFrom2Nix { + editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -3104,7 +3104,7 @@ final: prev: meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; - editorconfig-nvim = buildVimPluginFrom2Nix { + editorconfig-nvim = buildVimPlugin { pname = "editorconfig.nvim"; version = "2023-01-10"; src = fetchFromGitHub { @@ -3116,7 +3116,7 @@ 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"; src = fetchFromGitHub { @@ -3128,7 +3128,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -3140,7 +3140,7 @@ final: prev: 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,7 +3285,7 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; - feline-nvim = buildVimPluginFrom2Nix { + feline-nvim = buildVimPlugin { pname = "feline.nvim"; version = "2023-06-19"; src = fetchFromGitHub { @@ -3297,7 +3297,7 @@ final: prev: 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,7 +3321,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; - ferret = buildVimPluginFrom2Nix { + ferret = buildVimPlugin { pname = "ferret"; version = "2022-12-08"; src = fetchFromGitHub { @@ -3333,7 +3333,7 @@ final: prev: 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,7 +3382,7 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; - flash-nvim = buildVimPluginFrom2Nix { + flash-nvim = buildVimPlugin { pname = "flash.nvim"; version = "2023-08-29"; src = fetchFromGitHub { @@ -3394,7 +3394,7 @@ final: prev: meta.homepage = "https://github.com/folke/flash.nvim/"; }; - flatten-nvim = buildVimPluginFrom2Nix { + flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; version = "2023-09-15"; src = fetchFromGitHub { @@ -3406,7 +3406,7 @@ final: prev: 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,7 +3466,7 @@ 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"; src = fetchFromGitHub { @@ -3478,7 +3478,7 @@ final: prev: 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,7 +3490,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/"; }; - formatter-nvim = buildVimPluginFrom2Nix { + formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; version = "2023-08-14"; src = fetchFromGitHub { @@ -3502,7 +3502,7 @@ final: prev: meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; - forms = buildVimPluginFrom2Nix { + forms = buildVimPlugin { pname = "forms"; version = "2012-11-28"; src = fetchFromGitHub { @@ -3514,7 +3514,7 @@ final: prev: meta.homepage = "https://github.com/megaannum/forms/"; }; - friendly-snippets = buildVimPluginFrom2Nix { + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; version = "2023-09-03"; src = fetchFromGitHub { @@ -3526,7 +3526,7 @@ final: prev: 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,7 +3586,7 @@ 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"; src = fetchFromGitHub { @@ -3598,7 +3598,7 @@ final: prev: 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,7 +3622,7 @@ final: prev: meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; - fzf-lua = buildVimPluginFrom2Nix { + fzf-lua = buildVimPlugin { pname = "fzf-lua"; version = "2023-09-16"; src = fetchFromGitHub { @@ -3634,7 +3634,7 @@ final: prev: meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; - fzf-vim = buildVimPluginFrom2Nix { + fzf-vim = buildVimPlugin { pname = "fzf.vim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -3646,7 +3646,7 @@ final: prev: 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,7 +3682,7 @@ final: prev: meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; - ghcid = buildVimPluginFrom2Nix { + ghcid = buildVimPlugin { pname = "ghcid"; version = "2023-07-02"; src = fetchFromGitHub { @@ -3694,7 +3694,7 @@ final: prev: 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,7 +3718,7 @@ 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"; src = fetchFromGitHub { @@ -3730,7 +3730,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -3742,7 +3742,7 @@ final: prev: 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 { @@ -3802,7 +3802,7 @@ final: prev: 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,7 +3850,7 @@ final: prev: meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; - go-nvim = buildVimPluginFrom2Nix { + go-nvim = buildVimPlugin { pname = "go.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -3862,7 +3862,7 @@ final: prev: 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,7 +3898,7 @@ final: prev: meta.homepage = "https://github.com/buoto/gotests-vim/"; }; - goto-preview = buildVimPluginFrom2Nix { + goto-preview = buildVimPlugin { pname = "goto-preview"; version = "2023-07-19"; src = fetchFromGitHub { @@ -3910,7 +3910,7 @@ final: prev: 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,7 +3970,7 @@ final: prev: meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; - gruvbox-material = buildVimPluginFrom2Nix { + gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3982,7 +3982,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; - gruvbox-nvim = buildVimPluginFrom2Nix { + gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; version = "2023-08-29"; src = fetchFromGitHub { @@ -3994,7 +3994,7 @@ final: prev: 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,7 +4030,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; - hardtime-nvim = buildVimPluginFrom2Nix { + hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -4042,7 +4042,7 @@ final: prev: meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; - hare-vim = buildVimPluginFrom2Nix { + hare-vim = buildVimPlugin { pname = "hare.vim"; version = "2023-09-09"; src = fetchgit { @@ -4053,7 +4053,7 @@ final: prev: meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; - harpoon = buildVimPluginFrom2Nix { + harpoon = buildVimPlugin { pname = "harpoon"; version = "2023-05-28"; src = fetchFromGitHub { @@ -4077,7 +4077,7 @@ final: prev: 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,7 +4161,7 @@ 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"; src = fetchFromGitHub { @@ -4173,7 +4173,7 @@ final: prev: 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,7 +4232,7 @@ final: prev: meta.homepage = "https://github.com/urbit/hoon.vim/"; }; - hop-nvim = buildVimPluginFrom2Nix { + hop-nvim = buildVimPlugin { pname = "hop.nvim"; version = "2023-09-09"; src = fetchFromGitHub { @@ -4244,7 +4244,7 @@ final: prev: meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; - hotpot-nvim = buildVimPluginFrom2Nix { + hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -4256,7 +4256,7 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; - hover-nvim = buildVimPluginFrom2Nix { + hover-nvim = buildVimPlugin { pname = "hover.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -4268,7 +4268,7 @@ final: prev: 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,7 +4340,7 @@ final: prev: meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; - image-nvim = buildVimPluginFrom2Nix { + image-nvim = buildVimPlugin { pname = "image.nvim"; version = "2023-09-02"; src = fetchFromGitHub { @@ -4352,7 +4352,7 @@ final: prev: 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,7 +4412,7 @@ 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"; src = fetchFromGitHub { @@ -4424,7 +4424,7 @@ final: prev: 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,7 +4568,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; }; - jedi-vim = buildVimPluginFrom2Nix { + jedi-vim = buildVimPlugin { pname = "jedi-vim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -4581,7 +4581,7 @@ final: prev: 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,7 +4617,7 @@ final: prev: meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; - jq-vim = buildVimPluginFrom2Nix { + jq-vim = buildVimPlugin { pname = "jq.vim"; version = "2022-11-26"; src = fetchFromGitHub { @@ -4629,7 +4629,7 @@ final: prev: 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,7 +4653,7 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; - kanagawa-nvim = buildVimPluginFrom2Nix { + kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -4665,7 +4665,7 @@ final: prev: 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,7 +4773,7 @@ final: prev: meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; - lazy-nvim = buildVimPluginFrom2Nix { + lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -4785,7 +4785,7 @@ final: prev: meta.homepage = "https://github.com/folke/lazy.nvim/"; }; - lazygit-nvim = buildVimPluginFrom2Nix { + lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -4797,7 +4797,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; - lean-nvim = buildVimPluginFrom2Nix { + lean-nvim = buildVimPlugin { pname = "lean.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -4809,7 +4809,7 @@ final: prev: 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,7 +4845,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; - legendary-nvim = buildVimPluginFrom2Nix { + legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; version = "2023-07-08"; src = fetchFromGitHub { @@ -4857,7 +4857,7 @@ final: prev: 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,7 +5145,7 @@ 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"; src = fetchFromGitHub { @@ -5157,7 +5157,7 @@ final: prev: 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,7 +5205,7 @@ 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"; src = fetchgit { @@ -5216,7 +5216,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -5228,7 +5228,7 @@ final: prev: 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,7 +5252,7 @@ final: prev: meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; - lspsaga-nvim = buildVimPluginFrom2Nix { + lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; version = "2023-09-15"; src = fetchFromGitHub { @@ -5264,7 +5264,7 @@ final: prev: 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,7 +5288,7 @@ final: prev: meta.homepage = "https://github.com/arkav/lualine-lsp-progress/"; }; - lualine-nvim = buildVimPluginFrom2Nix { + lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; version = "2023-08-03"; src = fetchFromGitHub { @@ -5300,7 +5300,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; - luasnip = buildVimPluginFrom2Nix { + luasnip = buildVimPlugin { pname = "luasnip"; version = "2023-08-31"; src = fetchFromGitHub { @@ -5313,7 +5313,7 @@ final: prev: meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; - luatab-nvim = buildVimPluginFrom2Nix { + luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -5337,7 +5337,7 @@ final: prev: 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,7 +5373,7 @@ 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"; src = fetchFromGitHub { @@ -5385,7 +5385,7 @@ final: prev: 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,7 +5409,7 @@ 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"; src = fetchFromGitHub { @@ -5421,7 +5421,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -5433,7 +5433,7 @@ final: prev: meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; - mason-nvim = buildVimPluginFrom2Nix { + mason-nvim = buildVimPlugin { pname = "mason.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -5445,7 +5445,7 @@ final: prev: meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; - matchit-zip = buildVimPluginFrom2Nix { + matchit-zip = buildVimPlugin { pname = "matchit.zip"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5457,7 +5457,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; - material-nvim = buildVimPluginFrom2Nix { + material-nvim = buildVimPlugin { pname = "material.nvim"; version = "2023-07-11"; src = fetchFromGitHub { @@ -5469,7 +5469,7 @@ final: prev: 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,7 +5529,7 @@ final: prev: meta.homepage = "https://github.com/phaazon/mind.nvim/"; }; - mini-nvim = buildVimPluginFrom2Nix { + mini-nvim = buildVimPlugin { pname = "mini.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -5541,7 +5541,7 @@ final: prev: meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; - minimap-vim = buildVimPluginFrom2Nix { + minimap-vim = buildVimPlugin { pname = "minimap.vim"; version = "2023-07-25"; src = fetchFromGitHub { @@ -5553,7 +5553,7 @@ final: prev: meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; - mkdir-nvim = buildVimPluginFrom2Nix { + mkdir-nvim = buildVimPlugin { pname = "mkdir.nvim"; version = "2022-07-23"; src = fetchFromGitHub { @@ -5565,7 +5565,7 @@ final: prev: meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; - mkdnflow-nvim = buildVimPluginFrom2Nix { + mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; version = "2023-07-05"; src = fetchFromGitHub { @@ -5577,7 +5577,7 @@ final: prev: meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; - mkdx = buildVimPluginFrom2Nix { + mkdx = buildVimPlugin { pname = "mkdx"; version = "2023-08-23"; src = fetchFromGitHub { @@ -5589,7 +5589,7 @@ final: prev: 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,7 +5613,7 @@ 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"; src = fetchFromGitHub { @@ -5625,7 +5625,7 @@ final: prev: 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,7 +5649,7 @@ final: prev: meta.homepage = "https://github.com/yegappan/mru/"; }; - multicursors-nvim = buildVimPluginFrom2Nix { + multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -5661,7 +5661,7 @@ final: prev: 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,7 +5913,7 @@ 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"; src = fetchFromGitHub { @@ -5925,7 +5925,7 @@ final: prev: 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,7 +5937,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; - neoconf-nvim = buildVimPluginFrom2Nix { + neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -5949,7 +5949,7 @@ final: prev: meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; - neodark-vim = buildVimPluginFrom2Nix { + neodark-vim = buildVimPlugin { pname = "neodark.vim"; version = "2023-07-15"; src = fetchFromGitHub { @@ -5961,7 +5961,7 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; - neodev-nvim = buildVimPluginFrom2Nix { + neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; version = "2023-09-15"; src = fetchFromGitHub { @@ -5973,7 +5973,7 @@ final: prev: meta.homepage = "https://github.com/folke/neodev.nvim/"; }; - neoformat = buildVimPluginFrom2Nix { + neoformat = buildVimPlugin { pname = "neoformat"; version = "2023-08-20"; src = fetchFromGitHub { @@ -5985,7 +5985,7 @@ final: prev: meta.homepage = "https://github.com/sbdchd/neoformat/"; }; - neogen = buildVimPluginFrom2Nix { + neogen = buildVimPlugin { pname = "neogen"; version = "2023-09-09"; src = fetchFromGitHub { @@ -5997,7 +5997,7 @@ final: prev: meta.homepage = "https://github.com/danymat/neogen/"; }; - neogit = buildVimPluginFrom2Nix { + neogit = buildVimPlugin { pname = "neogit"; version = "2023-09-15"; src = fetchFromGitHub { @@ -6009,7 +6009,7 @@ final: prev: 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,7 +6069,7 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPluginFrom2Nix { + neorg = buildVimPlugin { pname = "neorg"; version = "2023-09-15"; src = fetchFromGitHub { @@ -6081,7 +6081,7 @@ final: prev: 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,7 +6177,7 @@ final: prev: meta.homepage = "https://github.com/MarkEmmons/neotest-deno/"; }; - neotest-dotnet = buildVimPluginFrom2Nix { + neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; version = "2023-08-13"; src = fetchFromGitHub { @@ -6189,7 +6189,7 @@ final: prev: 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,7 +6214,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; - neotest-haskell = buildVimPluginFrom2Nix { + neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; version = "2023-09-11"; src = fetchFromGitHub { @@ -6226,7 +6226,7 @@ final: prev: meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; - neotest-jest = buildVimPluginFrom2Nix { + neotest-jest = buildVimPlugin { pname = "neotest-jest"; version = "2023-09-03"; src = fetchFromGitHub { @@ -6238,7 +6238,7 @@ final: prev: 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,7 +6262,7 @@ final: prev: meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; - neotest-plenary = buildVimPluginFrom2Nix { + neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; version = "2023-04-27"; src = fetchFromGitHub { @@ -6274,7 +6274,7 @@ final: prev: 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,7 +6286,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; - neotest-rspec = buildVimPluginFrom2Nix { + neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; version = "2023-08-25"; src = fetchFromGitHub { @@ -6298,7 +6298,7 @@ final: prev: meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; - neotest-rust = buildVimPluginFrom2Nix { + neotest-rust = buildVimPlugin { pname = "neotest-rust"; version = "2023-09-16"; src = fetchFromGitHub { @@ -6310,7 +6310,7 @@ final: prev: 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,7 +6478,7 @@ final: prev: meta.homepage = "https://github.com/chr4/nginx.vim/"; }; - nightfox-nvim = buildVimPluginFrom2Nix { + nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -6490,7 +6490,7 @@ final: prev: 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,7 +6550,7 @@ 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"; src = fetchFromGitHub { @@ -6562,7 +6562,7 @@ final: prev: meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; - noice-nvim = buildVimPluginFrom2Nix { + noice-nvim = buildVimPlugin { pname = "noice.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -6574,7 +6574,7 @@ final: prev: meta.homepage = "https://github.com/folke/noice.nvim/"; }; - nord-nvim = buildVimPluginFrom2Nix { + nord-nvim = buildVimPlugin { pname = "nord.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -6586,7 +6586,7 @@ final: prev: 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 +6598,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 +6610,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,7 +6622,7 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; - nui-nvim = buildVimPluginFrom2Nix { + nui-nvim = buildVimPlugin { pname = "nui.nvim"; version = "2023-09-06"; src = fetchFromGitHub { @@ -6634,7 +6634,7 @@ final: prev: 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 +6646,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,7 +6658,7 @@ final: prev: meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; - nvchad = buildVimPluginFrom2Nix { + nvchad = buildVimPlugin { pname = "nvchad"; version = "2023-09-16"; src = fetchFromGitHub { @@ -6670,7 +6670,7 @@ final: prev: 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 +6682,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 +6694,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,7 +6706,7 @@ final: prev: meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; - nvim-autopairs = buildVimPluginFrom2Nix { + nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; version = "2023-09-08"; src = fetchFromGitHub { @@ -6718,7 +6718,7 @@ final: prev: meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; - nvim-base16 = buildVimPluginFrom2Nix { + nvim-base16 = buildVimPlugin { pname = "nvim-base16"; version = "2023-09-12"; src = fetchFromGitHub { @@ -6730,7 +6730,7 @@ final: prev: meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; - nvim-biscuits = buildVimPluginFrom2Nix { + nvim-biscuits = buildVimPlugin { pname = "nvim-biscuits"; version = "2023-03-28"; src = fetchFromGitHub { @@ -6742,7 +6742,7 @@ final: prev: meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; - nvim-bqf = buildVimPluginFrom2Nix { + nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; version = "2023-09-12"; src = fetchFromGitHub { @@ -6754,7 +6754,7 @@ final: prev: 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 +6766,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 +6790,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,7 +6802,7 @@ 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"; src = fetchFromGitHub { @@ -6814,7 +6814,7 @@ final: prev: 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 +6826,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 +6838,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 +6850,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 +6862,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,7 +6874,7 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-config-local/"; }; - nvim-coverage = buildVimPluginFrom2Nix { + nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; version = "2023-07-20"; src = fetchFromGitHub { @@ -6886,7 +6886,7 @@ final: prev: meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; - nvim-cursorline = buildVimPluginFrom2Nix { + nvim-cursorline = buildVimPlugin { pname = "nvim-cursorline"; version = "2022-04-15"; src = fetchFromGitHub { @@ -6898,7 +6898,7 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; }; - nvim-dap = buildVimPluginFrom2Nix { + nvim-dap = buildVimPlugin { pname = "nvim-dap"; version = "2023-09-14"; src = fetchFromGitHub { @@ -6910,7 +6910,7 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; - nvim-dap-go = buildVimPluginFrom2Nix { + nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; version = "2023-08-23"; src = fetchFromGitHub { @@ -6922,7 +6922,7 @@ final: prev: 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 +6934,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 +6946,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 +6958,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 +6970,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 +6982,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,7 +6994,7 @@ final: prev: meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; - nvim-gdb = buildVimPluginFrom2Nix { + nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; version = "2023-08-16"; src = fetchFromGitHub { @@ -7006,7 +7006,7 @@ final: prev: 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 +7018,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,7 +7030,7 @@ final: prev: meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; - nvim-highlite = buildVimPluginFrom2Nix { + nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; version = "2023-08-29"; src = fetchFromGitHub { @@ -7042,7 +7042,7 @@ final: prev: 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 +7054,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,7 +7066,7 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-jdtls = buildVimPluginFrom2Nix { + nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; version = "2023-09-14"; src = fetchFromGitHub { @@ -7078,7 +7078,7 @@ final: prev: 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 +7090,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 +7101,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 +7113,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 +7125,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,7 +7137,7 @@ 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"; src = fetchFromGitHub { @@ -7149,7 +7149,7 @@ final: prev: meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; - nvim-lint = buildVimPluginFrom2Nix { + nvim-lint = buildVimPlugin { pname = "nvim-lint"; version = "2023-09-14"; src = fetchFromGitHub { @@ -7161,7 +7161,7 @@ final: prev: 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 +7173,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,7 +7185,7 @@ 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"; src = fetchFromGitHub { @@ -7197,7 +7197,7 @@ final: prev: 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 +7209,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 +7221,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 +7233,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,7 +7245,7 @@ final: prev: meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; - nvim-metals = buildVimPluginFrom2Nix { + nvim-metals = buildVimPlugin { pname = "nvim-metals"; version = "2023-08-17"; src = fetchFromGitHub { @@ -7257,7 +7257,7 @@ final: prev: 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 +7269,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,7 +7281,7 @@ final: prev: meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; - nvim-navic = buildVimPluginFrom2Nix { + nvim-navic = buildVimPlugin { pname = "nvim-navic"; version = "2023-07-21"; src = fetchFromGitHub { @@ -7293,7 +7293,7 @@ final: prev: 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 +7305,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,7 +7317,7 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; - nvim-notify = buildVimPluginFrom2Nix { + nvim-notify = buildVimPlugin { pname = "nvim-notify"; version = "2023-09-10"; src = fetchFromGitHub { @@ -7329,7 +7329,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; - nvim-nu = buildVimPluginFrom2Nix { + nvim-nu = buildVimPlugin { pname = "nvim-nu"; version = "2023-03-07"; src = fetchFromGitHub { @@ -7341,7 +7341,7 @@ final: prev: meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; - nvim-osc52 = buildVimPluginFrom2Nix { + nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; version = "2023-05-15"; src = fetchFromGitHub { @@ -7353,7 +7353,7 @@ final: prev: 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 +7365,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 +7377,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 +7389,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 +7401,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,7 +7413,7 @@ final: prev: meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; - nvim-scrollview = buildVimPluginFrom2Nix { + nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; version = "2023-09-03"; src = fetchFromGitHub { @@ -7425,7 +7425,7 @@ final: prev: 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 +7437,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 +7449,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,7 +7461,7 @@ final: prev: meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; - nvim-spectre = buildVimPluginFrom2Nix { + nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; version = "2023-09-13"; src = fetchFromGitHub { @@ -7473,7 +7473,7 @@ final: prev: meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; - nvim-spider = buildVimPluginFrom2Nix { + nvim-spider = buildVimPlugin { pname = "nvim-spider"; version = "2023-09-14"; src = fetchFromGitHub { @@ -7485,7 +7485,7 @@ final: prev: 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 +7497,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 +7509,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 +7521,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,7 +7533,7 @@ 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"; src = fetchFromGitHub { @@ -7545,7 +7545,7 @@ final: prev: meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; - nvim-treesitter = buildVimPluginFrom2Nix { + nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; version = "2023-09-16"; src = fetchFromGitHub { @@ -7557,7 +7557,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -7569,7 +7569,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -7581,7 +7581,7 @@ final: prev: 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 +7593,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,7 +7605,7 @@ 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"; src = fetchFromGitHub { @@ -7617,7 +7617,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -7629,7 +7629,7 @@ final: prev: 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,7 +7641,7 @@ 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"; src = fetchFromGitHub { @@ -7653,7 +7653,7 @@ final: prev: 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 +7665,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,7 +7676,7 @@ final: prev: meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; - nvim-ufo = buildVimPluginFrom2Nix { + nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; version = "2023-09-13"; src = fetchFromGitHub { @@ -7688,7 +7688,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; - nvim-unception = buildVimPluginFrom2Nix { + nvim-unception = buildVimPlugin { pname = "nvim-unception"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7700,7 +7700,7 @@ 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"; src = fetchFromGitHub { @@ -7712,7 +7712,7 @@ final: prev: 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,7 +7724,7 @@ 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"; src = fetchFromGitHub { @@ -7736,7 +7736,7 @@ final: prev: 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 +7748,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 +7760,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 +7772,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 +7784,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 +7796,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,7 +7808,7 @@ final: prev: meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; - octo-nvim = buildVimPluginFrom2Nix { + octo-nvim = buildVimPlugin { pname = "octo.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -7820,7 +7820,7 @@ final: prev: meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; - oil-nvim = buildVimPluginFrom2Nix { + oil-nvim = buildVimPlugin { pname = "oil.nvim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -7833,7 +7833,7 @@ final: prev: 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 +7845,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,7 +7857,7 @@ final: prev: meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; - onedark-nvim = buildVimPluginFrom2Nix { + onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -7869,7 +7869,7 @@ final: prev: meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; - onedark-vim = buildVimPluginFrom2Nix { + onedark-vim = buildVimPlugin { pname = "onedark.vim"; version = "2023-07-19"; src = fetchFromGitHub { @@ -7881,7 +7881,7 @@ final: prev: meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; - onedarkpro-nvim = buildVimPluginFrom2Nix { + onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -7893,7 +7893,7 @@ final: prev: meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; - onehalf = buildVimPluginFrom2Nix { + onehalf = buildVimPlugin { pname = "onehalf"; version = "2022-08-02"; src = fetchFromGitHub { @@ -7905,7 +7905,7 @@ final: prev: meta.homepage = "https://github.com/sonph/onehalf/"; }; - onenord-nvim = buildVimPluginFrom2Nix { + onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -7917,7 +7917,7 @@ final: prev: 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 +7929,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,7 +7941,7 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; - openingh-nvim = buildVimPluginFrom2Nix { + openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -7953,7 +7953,7 @@ final: prev: meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; - openscad-nvim = buildVimPluginFrom2Nix { + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2023-06-19"; src = fetchFromGitHub { @@ -7965,7 +7965,7 @@ final: prev: meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; - orgmode = buildVimPluginFrom2Nix { + orgmode = buildVimPlugin { pname = "orgmode"; version = "2023-09-15"; src = fetchFromGitHub { @@ -7977,7 +7977,7 @@ final: prev: meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; - other-nvim = buildVimPluginFrom2Nix { + other-nvim = buildVimPlugin { pname = "other.nvim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -7989,7 +7989,7 @@ 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 { @@ -8001,7 +8001,7 @@ final: prev: meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; - overseer-nvim = buildVimPluginFrom2Nix { + overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -8014,7 +8014,7 @@ final: prev: meta.homepage = "https://github.com/stevearc/overseer.nvim/"; }; - oxocarbon-nvim = buildVimPluginFrom2Nix { + oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -8026,7 +8026,7 @@ final: prev: 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 +8038,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 +8050,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 +8062,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 +8074,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 +8086,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,7 +8098,7 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; - persistence-nvim = buildVimPluginFrom2Nix { + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -8110,7 +8110,7 @@ final: prev: 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 +8122,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 +8134,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 +8146,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 +8158,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 +8170,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 +8182,7 @@ final: prev: meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; - playground = buildVimPluginFrom2Nix { + playground = buildVimPlugin { pname = "playground"; version = "2023-09-15"; src = fetchFromGitHub { @@ -8206,7 +8206,7 @@ final: prev: 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 +8218,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 +8230,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 +8243,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 +8255,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 +8267,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 +8279,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 +8291,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 +8303,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 +8315,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 +8327,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 +8339,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 +8351,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,7 +8363,7 @@ final: prev: meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; - python-mode = buildVimPluginFrom2Nix { + python-mode = buildVimPlugin { pname = "python-mode"; version = "2023-07-03"; src = fetchFromGitHub { @@ -8376,7 +8376,7 @@ final: prev: 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 +8388,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,7 +8400,7 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; - quarto-nvim = buildVimPluginFrom2Nix { + quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; version = "2023-09-08"; src = fetchFromGitHub { @@ -8412,7 +8412,7 @@ final: prev: 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 +8424,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 +8436,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 +8448,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 +8460,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/quickmath.nvim/"; }; - rainbow = buildVimPluginFrom2Nix { + rainbow = buildVimPlugin { pname = "rainbow"; version = "2022-10-08"; src = fetchFromGitHub { @@ -8472,7 +8472,7 @@ 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"; src = fetchgit { @@ -8483,7 +8483,7 @@ final: prev: 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 +8495,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 +8507,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 +8519,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 +8531,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 +8543,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,7 +8555,7 @@ final: prev: meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; - refactoring-nvim = buildVimPluginFrom2Nix { + refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; version = "2023-08-31"; src = fetchFromGitHub { @@ -8567,7 +8567,7 @@ final: prev: meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; - registers-nvim = buildVimPluginFrom2Nix { + registers-nvim = buildVimPlugin { pname = "registers.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -8579,7 +8579,7 @@ final: prev: 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 +8591,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 +8603,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 { @@ -8627,7 +8627,7 @@ final: prev: 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 +8639,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 +8651,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 +8663,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 +8675,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 +8687,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 +8699,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 +8711,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 +8723,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 +8735,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,7 +8747,7 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; - satellite-nvim = buildVimPluginFrom2Nix { + satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -8759,7 +8759,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; - scnvim = buildVimPluginFrom2Nix { + scnvim = buildVimPlugin { pname = "scnvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -8771,7 +8771,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 +8783,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 +8795,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 +8807,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 +8819,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 +8831,7 @@ final: prev: meta.homepage = "https://github.com/RobertAudi/securemodelines/"; }; - self = buildVimPluginFrom2Nix { + self = buildVimPlugin { pname = "self"; version = "2014-05-28"; src = fetchFromGitHub { @@ -8843,7 +8843,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 +8855,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 +8867,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,7 +8879,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; - sg-nvim = buildVimPluginFrom2Nix { + sg-nvim = buildVimPlugin { pname = "sg.nvim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -8891,7 +8891,7 @@ final: prev: 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 +8903,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 +8916,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 +8928,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 +8940,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,7 +8952,7 @@ 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"; src = fetchFromGitHub { @@ -8964,7 +8964,7 @@ final: prev: 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 +8976,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 +8988,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 +9000,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 +9012,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 +9024,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 +9036,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 +9048,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 +9060,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 +9072,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 +9084,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 +9096,7 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; - sparkup = buildVimPluginFrom2Nix { + sparkup = buildVimPlugin { pname = "sparkup"; version = "2012-06-11"; src = fetchFromGitHub { @@ -9108,7 +9108,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 +9120,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 +9132,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 +9144,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 +9156,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 +9168,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 +9181,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,7 +9193,7 @@ final: prev: meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; - srcery-vim = buildVimPluginFrom2Nix { + srcery-vim = buildVimPlugin { pname = "srcery-vim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -9205,7 +9205,7 @@ final: prev: 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,7 +9217,7 @@ final: prev: meta.homepage = "https://github.com/chr4/sslsecure.vim/"; }; - ssr-nvim = buildVimPluginFrom2Nix { + ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; version = "2023-08-20"; src = fetchFromGitHub { @@ -9229,7 +9229,7 @@ final: prev: 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 +9241,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 +9253,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 +9265,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,7 +9277,7 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; - statuscol-nvim = buildVimPluginFrom2Nix { + statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; version = "2023-08-27"; src = fetchFromGitHub { @@ -9289,7 +9289,7 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; - stylish-nvim = buildVimPluginFrom2Nix { + stylish-nvim = buildVimPlugin { pname = "stylish.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -9301,7 +9301,7 @@ final: prev: meta.homepage = "https://github.com/teto/stylish.nvim/"; }; - substitute-nvim = buildVimPluginFrom2Nix { + substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; version = "2023-07-20"; src = fetchFromGitHub { @@ -9313,7 +9313,7 @@ final: prev: 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 +9325,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 +9337,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 +9349,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 +9361,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 +9373,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 +9385,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 +9397,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 +9410,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 +9422,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,7 +9434,7 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; - tabby-nvim = buildVimPluginFrom2Nix { + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -9446,7 +9446,7 @@ final: prev: 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 +9458,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 +9470,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 +9483,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 +9495,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 +9507,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 +9519,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 +9531,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,7 +9543,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; - tagbar = buildVimPluginFrom2Nix { + tagbar = buildVimPlugin { pname = "tagbar"; version = "2023-08-15"; src = fetchFromGitHub { @@ -9555,7 +9555,7 @@ final: prev: meta.homepage = "https://github.com/preservim/tagbar/"; }; - taglist-vim = buildVimPluginFrom2Nix { + taglist-vim = buildVimPlugin { pname = "taglist.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9567,7 +9567,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 +9579,7 @@ final: prev: meta.homepage = "https://github.com/wellle/targets.vim/"; }; - taskwiki = buildVimPluginFrom2Nix { + taskwiki = buildVimPlugin { pname = "taskwiki"; version = "2022-12-14"; src = fetchFromGitHub { @@ -9591,7 +9591,7 @@ final: prev: meta.homepage = "https://github.com/tools-life/taskwiki/"; }; - tcomment_vim = buildVimPluginFrom2Nix { + tcomment_vim = buildVimPlugin { pname = "tcomment_vim"; version = "2022-12-17"; src = fetchFromGitHub { @@ -9603,7 +9603,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; - telekasten-nvim = buildVimPluginFrom2Nix { + telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; version = "2023-09-08"; src = fetchFromGitHub { @@ -9616,7 +9616,7 @@ final: prev: 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 +9628,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 +9640,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 +9652,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,7 +9664,7 @@ 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"; src = fetchFromGitHub { @@ -9676,7 +9676,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -9688,7 +9688,7 @@ final: prev: 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 +9700,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 +9712,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 +9725,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 +9737,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 +9749,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 { @@ -9773,7 +9773,7 @@ final: prev: 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 +9785,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 +9797,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 +9809,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,7 +9821,7 @@ 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"; src = fetchFromGitHub { @@ -9833,7 +9833,7 @@ final: prev: 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 +9845,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 +9857,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 +9869,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 +9881,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 +9894,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 { @@ -9918,7 +9918,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; - telescope_hoogle = buildVimPluginFrom2Nix { + telescope_hoogle = buildVimPlugin { pname = "telescope_hoogle"; version = "2022-10-27"; src = fetchFromGitHub { @@ -9930,7 +9930,7 @@ final: prev: 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 +9942,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 +9954,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,7 +9966,7 @@ final: prev: meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; - terminus = buildVimPluginFrom2Nix { + terminus = buildVimPlugin { pname = "terminus"; version = "2021-12-28"; src = fetchFromGitHub { @@ -9978,7 +9978,7 @@ final: prev: meta.homepage = "https://github.com/wincent/terminus/"; }; - termwrapper-nvim = buildVimPluginFrom2Nix { + termwrapper-nvim = buildVimPlugin { pname = "termwrapper.nvim"; version = "2021-03-28"; src = fetchFromGitHub { @@ -9990,7 +9990,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 +10002,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 +10014,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 +10026,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 +10038,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 +10050,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 +10062,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 +10074,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 +10086,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 +10098,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 +10110,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 +10122,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 +10134,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,7 +10147,7 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; - toggleterm-nvim = buildVimPluginFrom2Nix { + toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -10159,7 +10159,7 @@ final: prev: meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; - tokyonight-nvim = buildVimPluginFrom2Nix { + tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; version = "2023-08-29"; src = fetchFromGitHub { @@ -10171,7 +10171,7 @@ final: prev: 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 +10183,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,7 +10195,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/train.nvim/"; }; - treesj = buildVimPluginFrom2Nix { + treesj = buildVimPlugin { pname = "treesj"; version = "2023-08-25"; src = fetchFromGitHub { @@ -10207,7 +10207,7 @@ final: prev: meta.homepage = "https://github.com/Wansmer/treesj/"; }; - tremor-vim = buildVimPluginFrom2Nix { + tremor-vim = buildVimPlugin { pname = "tremor-vim"; version = "2021-09-07"; src = fetchFromGitHub { @@ -10219,7 +10219,7 @@ final: prev: meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; - trim-nvim = buildVimPluginFrom2Nix { + trim-nvim = buildVimPlugin { pname = "trim.nvim"; version = "2023-03-22"; src = fetchFromGitHub { @@ -10231,7 +10231,7 @@ final: prev: meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; - trouble-nvim = buildVimPluginFrom2Nix { + trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -10243,7 +10243,7 @@ final: prev: 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 +10255,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,7 +10267,7 @@ final: prev: meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; - tsuquyomi = buildVimPluginFrom2Nix { + tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; version = "2022-04-12"; src = fetchFromGitHub { @@ -10279,7 +10279,7 @@ final: prev: meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; - twilight-nvim = buildVimPluginFrom2Nix { + twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -10291,7 +10291,7 @@ final: prev: meta.homepage = "https://github.com/folke/twilight.nvim/"; }; - typescript-vim = buildVimPluginFrom2Nix { + typescript-vim = buildVimPlugin { pname = "typescript-vim"; version = "2023-05-11"; src = fetchFromGitHub { @@ -10303,7 +10303,7 @@ final: prev: meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; - typescript-nvim = buildVimPluginFrom2Nix { + typescript-nvim = buildVimPlugin { pname = "typescript.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -10315,7 +10315,7 @@ 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"; src = fetchFromGitHub { @@ -10327,7 +10327,7 @@ final: prev: meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; - ultisnips = buildVimPluginFrom2Nix { + ultisnips = buildVimPlugin { pname = "ultisnips"; version = "2023-08-05"; src = fetchFromGitHub { @@ -10339,7 +10339,7 @@ final: prev: meta.homepage = "https://github.com/SirVer/ultisnips/"; }; - undotree = buildVimPluginFrom2Nix { + undotree = buildVimPlugin { pname = "undotree"; version = "2023-07-07"; src = fetchFromGitHub { @@ -10351,7 +10351,7 @@ final: prev: meta.homepage = "https://github.com/mbbill/undotree/"; }; - unicode-vim = buildVimPluginFrom2Nix { + unicode-vim = buildVimPlugin { pname = "unicode.vim"; version = "2023-03-19"; src = fetchFromGitHub { @@ -10363,7 +10363,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; - unison = buildVimPluginFrom2Nix { + unison = buildVimPlugin { pname = "unison"; version = "2023-09-14"; src = fetchFromGitHub { @@ -10375,7 +10375,7 @@ final: prev: meta.homepage = "https://github.com/unisonweb/unison/"; }; - unite-vim = buildVimPluginFrom2Nix { + unite-vim = buildVimPlugin { pname = "unite.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -10387,7 +10387,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; - urlview-nvim = buildVimPluginFrom2Nix { + urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; version = "2023-05-23"; src = fetchFromGitHub { @@ -10399,7 +10399,7 @@ final: prev: 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 +10411,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 +10423,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 +10435,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 +10447,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,7 +10459,7 @@ final: prev: meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vifm-vim = buildVimPluginFrom2Nix { + vifm-vim = buildVimPlugin { pname = "vifm.vim"; version = "2023-08-24"; src = fetchFromGitHub { @@ -10471,7 +10471,7 @@ final: prev: 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 +10483,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 +10495,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 +10507,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 +10519,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 +10531,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,7 +10543,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; - vim-abolish = buildVimPluginFrom2Nix { + vim-abolish = buildVimPlugin { pname = "vim-abolish"; version = "2023-04-10"; src = fetchFromGitHub { @@ -10555,7 +10555,7 @@ final: prev: 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 +10567,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 +10579,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 +10591,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 +10603,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 +10615,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 +10627,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 +10639,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 +10651,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 +10663,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 +10675,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 +10687,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 +10699,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 +10711,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 +10723,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 +10735,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 +10747,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 +10759,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 +10771,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 +10783,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,7 +10795,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-after-object/"; }; - vim-agda = buildVimPluginFrom2Nix { + vim-agda = buildVimPlugin { pname = "vim-agda"; version = "2022-03-01"; src = fetchFromGitHub { @@ -10807,7 +10807,7 @@ final: prev: meta.homepage = "https://github.com/msuperdock/vim-agda/"; }; - vim-airline = buildVimPluginFrom2Nix { + vim-airline = buildVimPlugin { pname = "vim-airline"; version = "2023-07-19"; src = fetchFromGitHub { @@ -10819,7 +10819,7 @@ final: prev: 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 +10831,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 +10843,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,7 +10855,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; - vim-android = buildVimPluginFrom2Nix { + vim-android = buildVimPlugin { pname = "vim-android"; version = "2023-08-24"; src = fetchFromGitHub { @@ -10867,7 +10867,7 @@ final: prev: 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 +10879,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 +10891,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,7 +10903,7 @@ final: prev: meta.homepage = "https://github.com/PeterRincker/vim-argumentative/"; }; - vim-argwrap = buildVimPluginFrom2Nix { + vim-argwrap = buildVimPlugin { pname = "vim-argwrap"; version = "2022-07-14"; src = fetchFromGitHub { @@ -10915,7 +10915,7 @@ final: prev: meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; - vim-asterisk = buildVimPluginFrom2Nix { + vim-asterisk = buildVimPlugin { pname = "vim-asterisk"; version = "2020-02-03"; src = fetchFromGitHub { @@ -10927,7 +10927,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; - vim-astro = buildVimPluginFrom2Nix { + vim-astro = buildVimPlugin { pname = "vim-astro"; version = "2022-08-25"; src = fetchFromGitHub { @@ -10939,7 +10939,7 @@ final: prev: 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 +10951,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 +10963,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 +10975,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 +10987,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 +10999,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 +11011,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 +11023,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 +11035,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 +11047,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 +11059,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 +11071,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 +11083,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 +11095,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 +11107,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 +11119,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 +11131,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 +11143,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 +11155,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 +11167,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 +11179,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 +11191,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 +11203,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 +11215,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 +11227,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 +11239,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 +11251,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 +11263,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 +11275,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 +11287,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 +11299,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 +11311,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 +11323,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 +11335,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 +11347,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 +11359,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 +11371,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 +11383,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 +11395,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 +11407,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 +11419,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 +11431,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 +11443,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 +11455,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 +11467,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 +11479,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 +11491,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 +11503,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,7 +11515,7 @@ final: prev: meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; - vim-dadbod = buildVimPluginFrom2Nix { + vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; version = "2023-05-22"; src = fetchFromGitHub { @@ -11527,7 +11527,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; - vim-dadbod-completion = buildVimPluginFrom2Nix { + vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; version = "2023-04-25"; src = fetchFromGitHub { @@ -11539,7 +11539,7 @@ final: prev: 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"; src = fetchFromGitHub { @@ -11551,7 +11551,7 @@ final: prev: 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 +11563,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 +11575,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 +11587,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 +11599,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 +11611,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 +11623,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 +11635,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 +11647,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 +11659,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 +11671,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 +11683,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 +11695,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 +11707,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 +11719,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 +11731,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 +11743,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 +11755,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 +11767,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 +11779,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 +11791,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 +11803,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 +11815,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 +11827,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 +11839,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 +11851,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 +11863,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 +11875,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 +11887,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 +11899,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 +11911,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 +11923,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 +11935,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 +11947,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 +11959,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 +11971,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,7 +11983,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-flagship/"; }; - vim-flake8 = buildVimPluginFrom2Nix { + vim-flake8 = buildVimPlugin { pname = "vim-flake8"; version = "2023-03-22"; src = fetchFromGitHub { @@ -11995,7 +11995,7 @@ final: prev: meta.homepage = "https://github.com/nvie/vim-flake8/"; }; - vim-flatbuffers = buildVimPluginFrom2Nix { + vim-flatbuffers = buildVimPlugin { pname = "vim-flatbuffers"; version = "2018-10-11"; src = fetchFromGitHub { @@ -12007,7 +12007,7 @@ final: prev: meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; - vim-floaterm = buildVimPluginFrom2Nix { + vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; version = "2023-09-02"; src = fetchFromGitHub { @@ -12019,7 +12019,7 @@ final: prev: 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 +12031,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 +12043,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 +12055,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 +12067,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,7 +12079,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; - vim-fugitive = buildVimPluginFrom2Nix { + vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; version = "2023-09-08"; src = fetchFromGitHub { @@ -12091,7 +12091,7 @@ final: prev: 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 +12103,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 +12115,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 +12127,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 +12139,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 +12151,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 +12163,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 +12175,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 +12187,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 +12199,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 +12211,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 +12223,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,7 +12235,7 @@ final: prev: meta.homepage = "https://github.com/jamessan/vim-gnupg/"; }; - vim-go = buildVimPluginFrom2Nix { + vim-go = buildVimPlugin { pname = "vim-go"; version = "2023-09-04"; src = fetchFromGitHub { @@ -12247,7 +12247,7 @@ final: prev: 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 +12259,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 +12271,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 +12283,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 +12295,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 +12307,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 +12319,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 +12331,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 +12343,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 +12355,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 +12367,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 +12379,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 +12391,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 +12403,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 +12416,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 +12428,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 +12440,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 +12452,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 +12464,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 +12476,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 +12488,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 +12500,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 +12512,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 +12524,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 +12536,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,7 +12548,7 @@ 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"; src = fetchFromGitHub { @@ -12560,7 +12560,7 @@ final: prev: 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 +12572,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 +12584,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 +12596,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 +12608,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 +12620,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 +12632,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 +12644,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 +12656,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 +12668,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 +12680,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 +12692,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 +12704,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 +12716,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 +12729,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 +12741,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 +12753,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 +12765,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 +12777,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 +12789,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 +12801,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,7 +12813,7 @@ final: prev: meta.homepage = "https://github.com/mroavi/vim-julia-cell/"; }; - vim-just = buildVimPluginFrom2Nix { + vim-just = buildVimPlugin { pname = "vim-just"; version = "2023-08-02"; src = fetchFromGitHub { @@ -12825,7 +12825,7 @@ final: prev: 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 +12837,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,7 +12849,7 @@ 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"; src = fetchFromGitHub { @@ -12861,7 +12861,7 @@ final: prev: 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 +12873,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 +12885,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 +12897,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 +12909,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 +12921,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 +12933,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 +12945,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 +12957,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 +12969,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 +12981,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 +12993,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 +13005,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 +13017,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,7 +13029,7 @@ final: prev: meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; - vim-lsp = buildVimPluginFrom2Nix { + vim-lsp = buildVimPlugin { pname = "vim-lsp"; version = "2023-09-09"; src = fetchFromGitHub { @@ -13041,7 +13041,7 @@ final: prev: 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 +13053,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,7 +13065,7 @@ 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"; src = fetchFromGitHub { @@ -13077,7 +13077,7 @@ final: prev: 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 +13089,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 +13101,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 +13113,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 +13125,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 +13137,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,7 +13149,7 @@ final: prev: meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; - vim-markdown = buildVimPluginFrom2Nix { + vim-markdown = buildVimPlugin { pname = "vim-markdown"; version = "2023-04-08"; src = fetchFromGitHub { @@ -13161,7 +13161,7 @@ final: prev: 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 +13174,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 +13186,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 +13198,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 +13210,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 +13222,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 +13234,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 +13246,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 +13258,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 +13270,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 +13282,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,7 +13294,7 @@ 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"; src = fetchFromGitHub { @@ -13306,7 +13306,7 @@ final: prev: meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; - vim-move = buildVimPluginFrom2Nix { + vim-move = buildVimPlugin { pname = "vim-move"; version = "2023-05-11"; src = fetchFromGitHub { @@ -13318,7 +13318,7 @@ final: prev: 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 +13330,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 +13342,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 +13354,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 +13366,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 +13378,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 +13390,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 +13402,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,7 +13414,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; - vim-nickel = buildVimPluginFrom2Nix { + vim-nickel = buildVimPlugin { pname = "vim-nickel"; version = "2023-07-05"; src = fetchFromGitHub { @@ -13426,7 +13426,7 @@ final: prev: 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 +13438,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 +13450,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 +13462,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 +13474,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 +13486,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 +13498,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 +13510,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 +13522,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 +13534,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 +13546,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 +13558,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 +13570,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 +13582,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 +13594,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 +13606,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 +13618,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,7 +13630,7 @@ final: prev: meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; - vim-oscyank = buildVimPluginFrom2Nix { + vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; version = "2023-07-01"; src = fetchFromGitHub { @@ -13642,7 +13642,7 @@ final: prev: 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 +13654,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 +13666,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 +13678,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 +13690,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 +13702,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 +13714,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 +13726,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 +13738,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 +13750,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 +13762,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 +13774,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 +13786,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 +13798,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 +13810,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 +13822,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 +13834,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 +13846,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,7 +13858,7 @@ final: prev: meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; - vim-pony = buildVimPluginFrom2Nix { + vim-pony = buildVimPlugin { pname = "vim-pony"; version = "2018-07-27"; src = fetchFromGitHub { @@ -13870,7 +13870,7 @@ final: prev: meta.homepage = "https://github.com/jakwings/vim-pony/"; }; - vim-poweryank = buildVimPluginFrom2Nix { + vim-poweryank = buildVimPlugin { pname = "vim-poweryank"; version = "2017-08-13"; src = fetchFromGitHub { @@ -13882,7 +13882,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; }; - vim-prettier = buildVimPluginFrom2Nix { + vim-prettier = buildVimPlugin { pname = "vim-prettier"; version = "2021-11-24"; src = fetchFromGitHub { @@ -13894,7 +13894,7 @@ final: prev: 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 +13906,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 +13918,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 +13930,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 +13942,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 +13954,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,7 +13966,7 @@ final: prev: meta.homepage = "https://github.com/uarun/vim-protobuf/"; }; - vim-ps1 = buildVimPluginFrom2Nix { + vim-ps1 = buildVimPlugin { pname = "vim-ps1"; version = "2023-01-11"; src = fetchFromGitHub { @@ -13978,7 +13978,7 @@ final: prev: 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 +13990,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 +14002,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 +14014,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 +14026,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 +14038,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 +14050,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 +14062,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 +14074,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 +14086,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 +14098,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 +14110,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 +14122,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 +14134,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 +14146,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 +14158,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 +14170,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 +14182,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 +14194,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 +14206,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 +14218,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 +14230,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 +14242,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 +14254,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 +14266,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 +14278,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 +14290,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 +14302,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 +14314,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 +14326,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 +14338,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 +14350,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 +14362,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 +14374,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,7 +14386,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; - vim-slime = buildVimPluginFrom2Nix { + vim-slime = buildVimPlugin { pname = "vim-slime"; version = "2023-08-29"; src = fetchFromGitHub { @@ -14398,7 +14398,7 @@ final: prev: 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 +14410,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 +14422,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 +14434,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 +14446,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 +14458,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 +14470,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 +14482,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 +14494,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 +14506,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 +14518,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 +14530,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 +14542,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 +14554,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,7 +14566,7 @@ final: prev: meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; - vim-startify = buildVimPluginFrom2Nix { + vim-startify = buildVimPlugin { pname = "vim-startify"; version = "2021-05-08"; src = fetchFromGitHub { @@ -14578,7 +14578,7 @@ final: prev: 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 +14590,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 +14602,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 +14614,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 +14626,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 +14638,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 +14650,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 +14662,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 +14674,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 +14686,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 +14698,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 +14710,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 +14722,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 +14734,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,7 +14746,7 @@ final: prev: meta.homepage = "https://github.com/erietz/vim-terminator/"; }; - vim-terraform = buildVimPluginFrom2Nix { + vim-terraform = buildVimPlugin { pname = "vim-terraform"; version = "2023-04-26"; src = fetchFromGitHub { @@ -14758,7 +14758,7 @@ final: prev: 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,7 +14771,7 @@ final: prev: meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/"; }; - vim-test = buildVimPluginFrom2Nix { + vim-test = buildVimPlugin { pname = "vim-test"; version = "2023-09-15"; src = fetchFromGitHub { @@ -14783,7 +14783,7 @@ final: prev: 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 +14795,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 +14807,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 +14819,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 +14831,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 +14843,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 +14855,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 +14867,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 +14879,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 +14891,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 +14903,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,7 +14915,7 @@ 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"; src = fetchFromGitHub { @@ -14927,7 +14927,7 @@ final: prev: 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 +14939,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,7 +14951,7 @@ final: prev: meta.homepage = "https://github.com/cespare/vim-toml/"; }; - vim-tpipeline = buildVimPluginFrom2Nix { + vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; version = "2023-09-10"; src = fetchFromGitHub { @@ -14963,7 +14963,7 @@ final: prev: 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 +14975,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 +14987,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 +14999,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 +15011,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 +15023,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 +15035,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 +15047,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 +15059,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 +15071,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 +15083,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 +15095,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 +15107,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 +15119,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 +15131,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 +15143,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 +15155,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 +15167,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,7 +15179,7 @@ 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"; src = fetchFromGitHub { @@ -15191,7 +15191,7 @@ final: prev: meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; }; - vim-wakatime = buildVimPluginFrom2Nix { + vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; version = "2023-08-16"; src = fetchFromGitHub { @@ -15203,7 +15203,7 @@ final: prev: 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 +15215,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 +15227,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 +15239,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 +15251,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 +15263,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 +15275,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 +15287,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 +15299,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 +15311,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 +15323,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 +15335,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 +15347,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 +15359,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 +15371,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 +15383,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 +15395,7 @@ final: prev: meta.homepage = "https://github.com/andrep/vimacs/"; }; - vimade = buildVimPluginFrom2Nix { + vimade = buildVimPlugin { pname = "vimade"; version = "2022-01-31"; src = fetchFromGitHub { @@ -15407,7 +15407,7 @@ final: prev: meta.homepage = "https://github.com/TaDaa/vimade/"; }; - vimagit = buildVimPluginFrom2Nix { + vimagit = buildVimPlugin { pname = "vimagit"; version = "2022-07-03"; src = fetchFromGitHub { @@ -15419,7 +15419,7 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; - vimelette = buildVimPluginFrom2Nix { + vimelette = buildVimPlugin { pname = "vimelette"; version = "2019-05-02"; src = fetchFromGitHub { @@ -15431,7 +15431,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 +15443,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 +15455,7 @@ final: prev: meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; - vimpreviewpandoc = buildVimPluginFrom2Nix { + vimpreviewpandoc = buildVimPlugin { pname = "vimpreviewpandoc"; version = "2023-08-14"; src = fetchFromGitHub { @@ -15467,7 +15467,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 +15479,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 +15491,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,7 +15503,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; - vimspector = buildVimPluginFrom2Nix { + vimspector = buildVimPlugin { pname = "vimspector"; version = "2023-09-10"; src = fetchFromGitHub { @@ -15516,7 +15516,7 @@ final: prev: meta.homepage = "https://github.com/puremourning/vimspector/"; }; - vimtex = buildVimPluginFrom2Nix { + vimtex = buildVimPlugin { pname = "vimtex"; version = "2023-09-11"; src = fetchFromGitHub { @@ -15528,7 +15528,7 @@ final: prev: meta.homepage = "https://github.com/lervag/vimtex/"; }; - vimux = buildVimPluginFrom2Nix { + vimux = buildVimPlugin { pname = "vimux"; version = "2022-09-26"; src = fetchFromGitHub { @@ -15540,7 +15540,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; - vimwiki = buildVimPluginFrom2Nix { + vimwiki = buildVimPlugin { pname = "vimwiki"; version = "2023-07-31"; src = fetchFromGitHub { @@ -15552,7 +15552,7 @@ final: prev: 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 +15564,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 +15576,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,7 +15588,7 @@ final: prev: meta.homepage = "https://github.com/navicore/vissort.vim/"; }; - vista-vim = buildVimPluginFrom2Nix { + vista-vim = buildVimPlugin { pname = "vista.vim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -15600,7 +15600,7 @@ final: prev: 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 +15612,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 +15624,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,7 +15636,7 @@ 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"; src = fetchFromGitHub { @@ -15648,7 +15648,7 @@ final: prev: 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 +15660,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,7 +15672,7 @@ final: prev: meta.homepage = "https://github.com/lervag/wiki-ft.vim/"; }; - wiki-vim = buildVimPluginFrom2Nix { + wiki-vim = buildVimPlugin { pname = "wiki.vim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -15684,7 +15684,7 @@ final: prev: 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 +15696,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 +15708,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 +15720,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 +15732,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 +15744,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 +15756,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 +15768,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,7 +15780,7 @@ final: prev: meta.homepage = "https://github.com/lukaszkorecki/workflowish/"; }; - wrapping-nvim = buildVimPluginFrom2Nix { + wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; version = "2023-08-08"; src = fetchFromGitHub { @@ -15792,7 +15792,7 @@ final: prev: 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 +15804,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 +15816,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 +15828,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 +15841,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 +15853,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 +15865,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,7 +15877,7 @@ 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"; src = fetchFromGitHub { @@ -15889,7 +15889,7 @@ final: prev: meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; - zenbones-nvim = buildVimPluginFrom2Nix { + zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -15901,7 +15901,7 @@ final: prev: meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; - zenburn = buildVimPluginFrom2Nix { + zenburn = buildVimPlugin { pname = "zenburn"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15913,7 +15913,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,7 +15925,7 @@ final: prev: meta.homepage = "https://github.com/nvimdev/zephyr-nvim/"; }; - zig-vim = buildVimPluginFrom2Nix { + zig-vim = buildVimPlugin { pname = "zig.vim"; version = "2023-07-22"; src = fetchFromGitHub { @@ -15937,7 +15937,7 @@ final: prev: meta.homepage = "https://github.com/ziglang/zig.vim/"; }; - zk-nvim = buildVimPluginFrom2Nix { + zk-nvim = buildVimPlugin { pname = "zk-nvim"; version = "2023-07-09"; src = fetchFromGitHub { @@ -15949,7 +15949,7 @@ final: prev: 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 +15961,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,7 +15973,7 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - catppuccin-nvim = buildVimPluginFrom2Nix { + catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -15985,7 +15985,7 @@ final: prev: meta.homepage = "https://github.com/catppuccin/nvim/"; }; - catppuccin-vim = buildVimPluginFrom2Nix { + catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -15997,7 +15997,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 +16009,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,7 +16021,7 @@ final: prev: meta.homepage = "https://github.com/embark-theme/vim/"; }; - gruvbox-community = buildVimPluginFrom2Nix { + gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; version = "2023-09-12"; src = fetchFromGitHub { @@ -16033,7 +16033,7 @@ final: prev: 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,7 +16045,7 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; - nightfly = buildVimPluginFrom2Nix { + nightfly = buildVimPlugin { pname = "nightfly"; version = "2023-09-01"; src = fetchFromGitHub { @@ -16057,7 +16057,7 @@ final: prev: 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,7 +16069,7 @@ final: prev: meta.homepage = "https://github.com/nordtheme/vim/"; }; - nvchad-ui = buildVimPluginFrom2Nix { + nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; version = "2023-09-13"; src = fetchFromGitHub { @@ -16081,7 +16081,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/ui/"; }; - pure-lua = buildVimPluginFrom2Nix { + pure-lua = buildVimPlugin { pname = "pure-lua"; version = "2021-05-16"; src = fetchFromGitHub { @@ -16093,7 +16093,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 +16105,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 +16117,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 +16129,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 +16141,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,7 +16153,7 @@ 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"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/vim/plugins/get-plugins.nix b/pkgs/applications/editors/vim/plugins/get-plugins.nix index f81b9fc3464e..06ed71f37924 100644 --- a/pkgs/applications/editors/vim/plugins/get-plugins.nix +++ b/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/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 299270a118f6..939c27c391b3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/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 { @@ -305,7 +305,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 +553,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 +594,7 @@ self: super: { }; # https://hurl.dev/ - hurl = buildVimPluginFrom2Nix { + hurl = buildVimPlugin { pname = "hurl"; version = hurl.version; # dontUnpack = true; @@ -658,7 +658,7 @@ self: super: { ''; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "LanguageClient-neovim"; inherit version; src = LanguageClient-neovim-src; @@ -707,7 +707,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 +767,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 +785,7 @@ self: super: { vimCommandCheck = "MinimapToggle"; }; - minsnip-nvim = buildVimPluginFrom2Nix { + minsnip-nvim = buildVimPlugin { pname = "minsnip.nvim"; version = "2022-01-04"; src = fetchFromGitHub { @@ -939,7 +939,7 @@ self: super: { inherit parinfer-rust; - phpactor = buildVimPluginFrom2Nix { + phpactor = buildVimPlugin { inherit (phpactor) pname src meta version; postPatch = '' substituteInPlace plugin/phpactor.vim \ @@ -1008,7 +1008,7 @@ self: super: { ''; }); - skim = buildVimPluginFrom2Nix { + skim = buildVimPlugin { pname = "skim"; inherit (skim) version; src = skim.vim; @@ -1048,7 +1048,7 @@ self: super: { doCheck = false; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "sniprun"; inherit version src; @@ -1061,7 +1061,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 +1086,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 +1136,7 @@ self: super: { }; }; - taskwarrior = buildVimPluginFrom2Nix { + taskwarrior = buildVimPlugin { inherit (taskwarrior) version pname; src = "${taskwarrior.src}/scripts/vim"; }; @@ -1222,7 +1222,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 @@ -1546,7 +1546,7 @@ self: super: { ''; }; - vim2nix = buildVimPluginFrom2Nix { + vim2nix = buildVimPlugin { pname = "vim2nix"; version = "1.0"; src = ./vim2nix; @@ -1570,7 +1570,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 +1706,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/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index b77032849b39..7af126f36507 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -74,7 +74,7 @@ class VimEditor(pluginupdate.Editor): with open(outfile, "w+") as f: f.write(HEADER) f.write(textwrap.dedent(""" - { lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: + { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { @@ -103,7 +103,7 @@ 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 diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 4236cf79e135..271f50919fc5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/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/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 16317a5d0c66..7b023118f057 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/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/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim index 0ddbeaae6be1..f6160795c5c8 100644 --- a/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim +++ b/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/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index f0cd38de8949..b090864d0d00 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='Release'" "-DENABLE_FFMPEG='true'" "-DENABLE_LINK='true'" "-DSYSCONFDIR=etc" diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index 4a792c973b53..1d150cb9ffe9 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-09-13 +# Last updated: 2023-09-27 { compatList = { - rev = "463d5f3537eed71638d4f5809467afec1eb5988c"; + rev = "0e93552d7d65a8eb5149d69488281e4abeeba396"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1557"; - hash = "sha256:19wlia1g2ll9fwbn4yj57cax4lvs3d6w41z2yy2pjdq84yzgg1gs"; + version = "1569"; + hash = "sha256:17qs5fn75zqxz0c325zyj46z79pvm2j536afyg96glq6av2kql2b"; }; ea = { - version = "3864"; - distHash = "sha256:02dxf9f33agnp91myxxklrdjalh6d32zjlg07p7v5v48mymnxhv9"; - fullHash = "sha256:020ljbgb79i66y6fqj4xblzv4s808l50jy7wwl0d6jwpck1q3i11"; + version = "3897"; + distHash = "sha256:1kxn7hcrn7kkdjgkxpxjw2pdrg73jhlbv3gvhc6z8358bav7xcbs"; + fullHash = "sha256:1zc1k90f4jzbm8l8fjfsnd77hljh4nqa78l7cczcc3yv2jwrgrz6"; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index fa90b95bd733..7ce2f4c5a27e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, perlPackages , python3 }: @@ -47,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-15"; + version = "7.1.1-18"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; + hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -125,12 +126,14 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "http://www.imagemagick.org/"; + changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; description = "A software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index 2a0853fb2212..f30a6acbbbee 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBRLCAD_ENABLE_STRICT=OFF" - "-DCMAKE_BUILD_TYPE=Release" ]; meta = with lib; { diff --git a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch new file mode 100644 index 000000000000..e7200814eb05 --- /dev/null +++ b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch @@ -0,0 +1,18 @@ +diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py +index 809338ef..9125928f 100644 +--- a/hydrus/core/HydrusConstants.py ++++ b/hydrus/core/HydrusConstants.py +@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU: + RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) + RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) + +-if RUNNING_FROM_SOURCE: +- NICE_RUNNING_AS_STRING = 'from source' +-elif RUNNING_FROM_FROZEN_BUILD: +- NICE_RUNNING_AS_STRING = 'from frozen build' +-elif RUNNING_FROM_MACOS_APP: +- NICE_RUNNING_AS_STRING = 'from App' ++NICE_RUNNING_AS_STRING = "from nixpkgs (source)" + + BIN_DIR = os.path.join( BASE_DIR, 'bin' ) + HELP_DIR = os.path.join( BASE_DIR, 'help' ) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index ed8f2bef9e35..968f60ba8096 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,16 +12,21 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "520"; + version = "544"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI="; + hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A="; }; + patches = [ + # Nixpkgs specific, can be removed if upstream makes a more reasonable check + ./0001-inform-nixpkgs.patch + ]; + nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material @@ -37,13 +42,16 @@ python3Packages.buildPythonPackage rec { cbor2 chardet cloudscraper + dateparser html5lib lxml lz4 numpy opencv4 pillow + pillow-heif psutil + psd-tools pympler pyopenssl pyqt6 @@ -56,7 +64,6 @@ python3Packages.buildPythonPackage rec { requests send2trash service-identity - six twisted ]; @@ -92,6 +99,7 @@ python3Packages.buildPythonPackage rec { -e TestHydrusSessions \ -e TestServer \ -e TestClientMetadataMigration \ + -e TestClientFileStorage \ ''; outputs = [ "out" "doc" ]; @@ -100,13 +108,16 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + # Fix random files being marked with execute permissions + chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} + # Build docs mkdocs build -d help mv help $out/doc/ # install the hydrus binaries mkdir -p $out/bin - install -m0755 server.py $out/bin/hydrus-server - install -m0755 client.py $out/bin/hydrus-client + install -m0755 hydrus_server.py $out/bin/hydrus-server + install -m0755 hydrus_client.py $out/bin/hydrus-client '' + lib.optionalString enableSwftools '' mkdir -p $out/${python3Packages.python.sitePackages}/bin # swfrender seems to have to be called sfwrender_linux diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 4f16661cedb1..4a946ef8c159 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -47,10 +47,11 @@ mkDerivation rec { --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' ''; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; preInstall = '' diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 0bd1fc20c59f..9448e0b17213 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libpano13"; - version = "2.9.21"; + version = "2.9.22"; src = fetchurl { url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz"; - sha256 = "sha256-eeWhRSGZMF4pYUYnIO9ZQRUnecEnxblvw0DSSS5jNZA="; + sha256 = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM="; }; buildInputs = [ perl libjpeg libpng libtiff ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index c50a0ebb7490..14c86082e671 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -45,7 +45,6 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DPARAVIEW_ENABLE_FFMPEG=ON" "-DPARAVIEW_ENABLE_GDAL=ON" "-DPARAVIEW_ENABLE_MOTIONFX=ON" diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index d146919e556f..ec37b9b429f0 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.8.1"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-gmFT6onuoaw9WDCUDImZM/AxuZECqPC73ZyNnp6WSGA="; + hash = "sha256-w5rjLqdlPOZWgdc2t0Y3tl24qZqpjBV6I9gruLaI+qc="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/appcleaner/default.nix b/pkgs/applications/misc/appcleaner/default.nix new file mode 100644 index 000000000000..eff32c76f988 --- /dev/null +++ b/pkgs/applications/misc/appcleaner/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "appcleaner"; + version = "3.6.8"; + + src = fetchurl { + url = "https://freemacsoft.net/downloads/AppCleaner_${finalAttrs.version}.zip"; + hash = "sha256-4BL3KUQkc8IOfM4zSwAYJSHktmcupoGzSTGxgP6z1r4="; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Uninstall unwanted apps"; + homepage = "https://freemacsoft.net/appcleaner"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 84aaa4295729..24797b0602c8 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -15,6 +15,8 @@ , potrace , openxr-loader , embree, gmp, libharu +, mesa +, runCommand }: let @@ -26,13 +28,13 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-olEmcOM3VKo/IWOhQp/qOkdJvwzM7bCkf8i8Bzh07Eg="; + hash = "sha256-iRIwPrvPHwiIxHr7hpmG6NjS/liJkxcAgrzlk8LEFPg="; }; patches = [ @@ -184,7 +186,45 @@ stdenv.mkDerivation rec { done ''; - passthru = { inherit python; }; + passthru = { + inherit python; + + tests = { + render = runCommand "${pname}-test" { } '' + set -euo pipefail + + export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri + export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json + + cat <<'PYTHON' > scene-config.py + import bpy + bpy.context.scene.eevee.taa_render_samples = 32 + bpy.context.scene.cycles.samples = 32 + if ${if stdenv.isAarch64 then "True" else "False"}: + bpy.context.scene.cycles.use_denoising = False + bpy.context.scene.render.resolution_x = 100 + bpy.context.scene.render.resolution_y = 100 + bpy.context.scene.render.threads_mode = 'FIXED' + bpy.context.scene.render.threads = 1 + PYTHON + + mkdir $out + for engine in BLENDER_EEVEE CYCLES; do + echo "Rendering with $engine..." + # Beware that argument order matters + ${finalAttrs.finalPackage}/bin/blender \ + --background \ + -noaudio \ + --factory-startup \ + --python-exit-code 1 \ + --python scene-config.py \ + --engine "$engine" \ + --render-output "$out/$engine" \ + --render-frame 1 + done + ''; + }; + }; meta = with lib; { description = "3D Creation/Animation/Publishing System"; @@ -198,4 +238,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ goibhniu veprbl ]; mainProgram = "blender"; }; -} +}) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 15dbb33118b8..bd4504611758 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -14,7 +14,7 @@ , libXtst , zlib , maven -, webkitgtk_4_1 +, webkitgtk , glib-networking }: @@ -53,7 +53,7 @@ mavenJdk17.buildMavenPackage rec { libXtst zlib ] ++ lib.optionals stdenv.isLinux [ - webkitgtk_4_1 + webkitgtk glib-networking ]; @@ -109,7 +109,7 @@ mavenJdk17.buildMavenPackage rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk17}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index a136f1f678ae..3a6f25ede695 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { substituteInPlace src/CMakeLists.txt --replace '@libirc_includes@' '${libirc.out}' ''; + cmakeBuildType = "None"; + cmakeFlags = [ "-S" "/build/source/src" - "-DCMAKE_BUILD_TYPE=None" "-DINSTALL_DATA_DIR=bin" "-DQT5_BUILD=ON" "-DWEB_ENGINE=ON" diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 277a1b99cc1e..762434ef12c1 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "sha256-OBEjczUIkY3pQXJfsuNj9Bm2TIbVWEHqMSolQnSfvLE="; + hash = "sha256-xgrkMz7BCBxjfxHsAz/CFLv1d175LnrAJIOZMM3GmU0="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato srapenne ]; + maintainers = with maintainers; [ jonafato srapenne blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/keyleds/default.nix b/pkgs/applications/misc/keyleds/default.nix index c48b30b34dc9..a759b8e393e9 100644 --- a/pkgs/applications/misc/keyleds/default.nix +++ b/pkgs/applications/misc/keyleds/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=MinSizeRel" - ]; + cmakeBuildType = "MinSizeRel"; meta = { homepage = "https://github.com/keyleds/keyleds"; diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index b4c455c0ce04..84edbc567b41 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -46,7 +46,6 @@ in dontWrapQtApps = true; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" ]; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index f10201b4f375..c7cfbbbb65d3 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.28.1.3"; + version = "3.28.2.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-4Kr/zKE2VqAblNvxT9dg1325V0OCMca3MPEiG3fTxT4="; + sha256 = "sha256-0iH+fuh7jurk7FmEdTig+Tfm7ts3b2Azqv6T5kUNpg4="; }; patches = [ diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index 1fcee352bdc4..77b80ef2147b 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "slweb"; - version = "0.6.7"; + version = "0.6.9"; src = fetchFromSourcehut { owner = "~strahinja"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y7w3yVqA8MNJJ3OcGaeziydZyzF0bap41Il6eE/Hu40="; + sha256 = "sha256-YSHJJ+96Xj2zaDtPi8jftPWIyeIG9LwQ/eYT/oh2Y2c="; }; nativeBuildInputs = [ redo-apenwarr ]; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index c840bbfe5b84..17affeb3bbf6 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitLab, ocaml +{ lib, buildDunePackage, fetchFromGitLab, fetchpatch, ocaml , fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx , dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl }: @@ -10,7 +10,6 @@ else buildDunePackage rec { pname = "stog"; version = "0.20.0"; - duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; @@ -20,6 +19,12 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; + # Compatibility with higlo 0.9 + patches = fetchpatch { + url = "https://framagit.org/zoggy/stog/-/commit/ea0546ab4cda8cc5c4c820ebaf2e3dfddc2ab101.patch"; + hash = "sha256-86GRHF9OjfcalGfA0Om2wXH99j4THCs9a4+o5ghuiJc="; + }; + nativeBuildInputs = [ menhir ]; buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 026f5ae5014e..640a367b8bb2 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "sha256-qD49NExR0OZ6hgt5ejGiltxF9xkmseJjhJNzEGofnhw="; + sha256 = "sha256-0obIMnPBvMO30o+qXqwtINNRobBR6cFO65B/xjVt+2w="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index ca5a4684a48c..9a76eed6dff6 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rustPlatform , cmake , pkg-config @@ -26,6 +27,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno="; + patches = [ + (fetchpatch { + name = "CVE-2023-40274.patch"; + url = "https://github.com/getzola/zola/commit/fe1967fb0fe063b1cee1ad48820870ab2ecc0e5b.patch"; + hash = "sha256-B/SVGhVX5hAbvMhBYO+mU5+xdZXU2JyS4uKmOj+aZuI="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe3df61ae10b..a9aeb759f4eb 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.58.124"; + version = "1.58.129"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-Q/bdauGZR68ueeKxOKI8X7OAc7UmNgixxEJncDsYhH0="; + sha256 = "sha256-AJ287Ph6iGnodw3Xt2XMlryBlBLNnvEI8rwpuo5ubKc="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e67e3c114468..f1020296d84a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ }; stable = { chromedriver = { - sha256_darwin = "0phhcqid7wjw923qdi65zql3fid25swwszksgnw3b8fgz67jn955"; + sha256_darwin = "138mw5p6r0n0531fs6322yxsjgj9hia5plw4mj0b3mclykzy5l37"; sha256_darwin_aarch64 = - "00fwq8slvjm6c7krgwjd4mxhkkrp23n4icb63qlvi2hy06gfj4l6"; - sha256_linux = "0ws8ch1j2hzp483vr0acvam1zxmzg9d37x6gqdwiqwgrk6x5pvkh"; - version = "117.0.5938.88"; + "1cym94av2gw2zwj3rdqbjcqkigpzf0zk2bam2hw9n2hiabb4rm0p"; + sha256_linux = "1q1vyhmcx6b5criz5bn1c3x3z2dzqdgsmwcvlb0rzqlzpla9q26m"; + version = "117.0.5938.92"; }; deps = { gn = { @@ -41,9 +41,9 @@ version = "2023-08-01"; }; }; - sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6"; - sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi"; - version = "117.0.5938.88"; + sha256 = "0b1l8gjhqbsyqi30rsn8dyq2hdvwasdqfk1qzk55f9ch4wclkjk5"; + sha256bin64 = "047w7y4c8k076yzrjc50lvwncbk8b3lyqnd1si9nrsl7c66j2h0q"; + version = "117.0.5938.92"; }; ungoogled-chromium = { deps = { @@ -54,12 +54,12 @@ version = "2023-08-01"; }; ungoogled-patches = { - rev = "117.0.5938.88-1"; - sha256 = "1wz15ib56j8c84bgrbf0djk5wli49b1lvaqbg18pdclkp1mqy5w9"; + rev = "117.0.5938.92-1"; + sha256 = "0ix0vaki9r305js61qraiah3vqjaj3dyycabi6grfavdgjpjkasb"; }; }; - sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6"; - sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi"; - version = "117.0.5938.88"; + sha256 = "0b1l8gjhqbsyqi30rsn8dyq2hdvwasdqfk1qzk55f9ch4wclkjk5"; + sha256bin64 = "047w7y4c8k076yzrjc50lvwncbk8b3lyqnd1si9nrsl7c66j2h0q"; + version = "117.0.5938.92"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 31d1ef692065..c0624e915acb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,44 +1,13 @@ -{ lib, stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook, autoPatchelfHook , alsa-lib -, atk -, cairo , curl -, cups , dbus-glib -, dbus -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc , gtk3 -, libkrb5 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXrandr -, libXt , libXtst -, libcanberra -, libnotify -, adwaita-icon-theme -, libGLU, libGL -, nspr -, nss -, pango -, pipewire +, libva , pciutils -, heimdal -, libpulseaudio -, systemd +, pipewire +, adwaita-icon-theme , channel , generated , writeScript @@ -48,9 +17,7 @@ , gnused , gnugrep , gnupg -, ffmpeg , runtimeShell -, mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en_US" }: @@ -58,6 +25,8 @@ let inherit (generated) version sources; + binaryName = if channel == "release" then "firefox" else "firefox-${channel}"; + mozillaPlatforms = { i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; @@ -95,115 +64,54 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - alsa-lib - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libkrb5 - mesa - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXrandr - libXt - libXtst - libcanberra - libnotify - libGLU libGL - nspr - nss - pango - pipewire - pciutils - heimdal - libpulseaudio - systemd - ffmpeg - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; - - inherit gtk3; - - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ gtk3 adwaita-icon-theme ]; - - # "strip" after "patchelf" may break binaries. - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = true; - dontPatchELF = true; - - postPatch = '' - # Don't download updates from Mozilla directly - echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js - ''; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; + buildInputs = [ + gtk3 + adwaita-icon-theme + alsa-lib + dbus-glib + libXtst + ]; + runtimeDependencies = [ + curl + libva.out + pciutils + ]; + appendRunpaths = [ + "${pipewire.lib}/lib" + ]; installPhase = '' - mkdir -p "$prefix/usr/lib/firefox-bin-${version}" - cp -r * "$prefix/usr/lib/firefox-bin-${version}" + mkdir -p "$prefix/lib/firefox-bin-${version}" + cp -r * "$prefix/lib/firefox-bin-${version}" mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" - - for executable in \ - firefox firefox-bin plugin-container \ - updater crashreporter webapprt-stub \ - glxtest vaapitest - do - if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/firefox-bin-${version}/$executable" - fi - done - - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/firefox-bin-${version}/{}" \; - - # wrapFirefox expects "$out/lib" instead of "$out/usr/lib" - ln -s "$out/usr/lib" "$out/lib" - - gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") + ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}" # See: https://github.com/mozilla/policy-templates/blob/master/README.md mkdir -p "$out/lib/firefox-bin-${version}/distribution"; ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; - passthru.binaryName = "firefox"; - passthru.libName = "firefox-bin-${version}"; - passthru.execdir = "/bin"; - passthru.ffmpegSupport = true; - passthru.gssSupport = true; - # update with: - # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped - passthru.updateScript = import ./update.nix { - inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; - baseUrl = - if channel == "devedition" - then "https://archive.mozilla.org/pub/devedition/releases/" - else "https://archive.mozilla.org/pub/firefox/releases/"; + passthru = { + inherit binaryName; + libName = "firefox-bin-${version}"; + ffmpegSupport = true; + gssSupport = true; + gtk3 = gtk3; + + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped + updateScript = import ./update.nix { + inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + baseUrl = + if channel == "devedition" + then "https://archive.mozilla.org/pub/devedition/releases/" + else "https://archive.mozilla.org/pub/firefox/releases/"; + }; }; + meta = with lib; { changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/"; description = "Mozilla Firefox, free web browser (binary package)"; @@ -213,5 +121,6 @@ stdenv.mkDerivation { platforms = builtins.attrNames mozillaPlatforms; hydraPlatforms = []; maintainers = with maintainers; [ taku0 lovesegfault ]; + mainProgram = binaryName; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 042059c04462..52cd7acfa522 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1015 +1,1015 @@ { - version = "117.0.1"; + version = "118.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ach/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ach/firefox-118.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bba2d74a558ff32c5e723708ab462cdd3af56aeccd06e5b4e842cd8a99f716e5"; + sha256 = "4d249f0f3fd8c19ae549cddc01a0362d35292b8bf0171fbe97fca9689a58738a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/af/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/af/firefox-118.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d7d3337e66a0cb6d63d669e7f9aa8a1afc970aeaa079dd206f2faea9d86f934c"; + sha256 = "57737ea620620bc9e911f686204af894e851cc67137d9d7cf4aa1e7889ae0687"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/an/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/an/firefox-118.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "430c9a492de3dd9d0250901cb8e8ed675c6cf3e492f814a4e386d07998a2724f"; + sha256 = "4d090147487b1ffdeaaedd5d7a6bc4383403cf2b1a1b17af685eadad74364ffe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ar/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ar/firefox-118.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8043636c3639d4803093eb1ff25a23a0a9e6b3746f06c03e0ac2ba5abeadfd55"; + sha256 = "36c62f6198e9b9f60e1c8dbe58dde79f3bb3abf54ab14072ea58aca579cdf591"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ast/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ast/firefox-118.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b628087eb248939b53f744937d9f8c07bc204c65915a019e7cfaecfe2f8548f3"; + sha256 = "a94b9b425d3fb2329d61589a3a7d8601e408afb6a01f237f03d06461f6e5f816"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/az/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/az/firefox-118.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "f9398fa0e7e8bd1146a2c28135aaaf785d6ea53e5795cd8aecb7d4df4fe744b0"; + sha256 = "58b761aac3fd66581c57cec6cd44c299a7af61fd9d497a1204646febe93e09b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/be/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/be/firefox-118.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d8645fdd9c897d46f1ef169dae1e89b70e31adc0df743dac2f06eb4c1783646d"; + sha256 = "c20b25c3dcbc54625933d39d39fc626b14d44ef04b307663d7a63b6e2d7a6203"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/bg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/bg/firefox-118.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6d5d684d096ea94b995c4fdca48dfdd423c7f3f203124ae39413ce301cca7e51"; + sha256 = "aa3f77341e1e5b2b3f63f34e8f0d191fdd81f44184be69d20f69649d8e6907fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/bn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/bn/firefox-118.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "054b468d029161b2fcadddc470a200f7d908bde5ae0fe5e187d9b5a594ce703d"; + sha256 = "175d60fbb53c7a05fe92017606a81e05725c7bb396a5caedd311cf367cc1fd76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/br/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/br/firefox-118.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4d3c5fb7ec494ca2bd4e52ea62e73405121777d38a2a833b39e4eddc3f21adfc"; + sha256 = "0d93ad02e8087ef78839421d7bb3425b8d99a444b329e96a8558bc3dc1c55b3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/bs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/bs/firefox-118.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fb2d1bc9329f73b889ad2149f157be4fd9219e4d4d1b160a61562a527d1d610c"; + sha256 = "fd98bbb938ce42f5823fac75add882497f6633a34a3d284a89d30e4c39c8276b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ca-valencia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ca-valencia/firefox-118.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bc263c2196669b93226eda1825b6f2350c6bcf91cffd40ab12d3bd1a3c8148fc"; + sha256 = "bbdc1a54fb34b3805333751b63c301fe02a71d197cfa1e88fd8a3e4ceb2d5ffb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ca/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ca/firefox-118.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "15087bd5732537e640034b9c3a70efc3e73b8aed20444b3ad63bdb242cb0aabf"; + sha256 = "78d588b28da9450cc2c58978b2f411722f5c1a80de9a17b2e88d7ecbc33782d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/cak/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/cak/firefox-118.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "de6624dd9c6860d7ac3b03dc299b38e066babcae96187669f6df8257b42235a3"; + sha256 = "8a2d6a871ca38b76bda8226d179c98be0d0c02c3b66975e263e78622019ad328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/cs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/cs/firefox-118.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d7bdd96c4c595d531cfc086553ab0704ec191e92ed54333f79a25d06bb8d6bec"; + sha256 = "506301cd6ada0b41386e3853b29d25a589c84335952b9ebdeadb09cc4c1287e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/cy/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/cy/firefox-118.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7390d9f3e59a12fb9c181f340dbaca2be199cbac8fcee58b3d791f298f19feb2"; + sha256 = "9aaa5cd0935068b98c6a27253edd4290f65acbc6a21eb47f09aebf116f19307d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/da/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/da/firefox-118.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "41275e9881e4a4a9a61aa148d2f762fa17de9d042fbad7d453b886841e684bc5"; + sha256 = "fd6c7c7d03fccb03bf99398e30456a0f808e6238287b5ca8a8ac41713b0d0dd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/de/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/de/firefox-118.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc19cb1199dcd7a86a4948309a5a0b220745f8fd2cf7108688b7f800a8d47510"; + sha256 = "687cb2906ec21b93dd4887c61731a251334fcee7a523bd09a0c04095eba9d86e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/dsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/dsb/firefox-118.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "535994c82cd9aeb4b29658c0391c7264103cfaea0523db1cfcd649bd625f3402"; + sha256 = "b6ce5a52133025eff5e0dac1f3f327a85b234fd3f2fbbbd5308d2eb7c1a840cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/el/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/el/firefox-118.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8adbce720ef045f2a06ff61ac09e4ad36bd9b68c09544615ea4404104caf59c6"; + sha256 = "3ddb1a4d3421838d6332768607af17da10e0276b178de55ba93631c287579ad4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/en-CA/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/en-CA/firefox-118.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "11a0d2714181a0d6c3034e11b4d053826f48765baf495c050b0f983855230ba1"; + sha256 = "bbc651ae9f55979da8b595ed5499532e520b23941b3f387dbafb75d36da7bda0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/en-GB/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/en-GB/firefox-118.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "99d99376ace7f318e6a972ee14b05c51d43b5cb3431fdea03574a59d34e8c7bc"; + sha256 = "192301eb70b80d5be28019c47892e4b4e210f889fc24ac4de98bd6d898f1171a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/en-US/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/en-US/firefox-118.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e70b282ed0b8ce42981675ca2bc9a69fbad23f31f71fbd700b52dcf79e57761c"; + sha256 = "03aac97fe86b4a8102c078bc93852e83146dbc811e60ecd74e0d964954194e4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/eo/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/eo/firefox-118.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "abcde5b6fe8bd9e543729dd87dc99b1bb42013f1741b3ae4d20ab4dd64186572"; + sha256 = "e7d549455eb6dc66fcb662740b5dcd3d615d71ec19e62262b6c4f70281d4a47b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-AR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/es-AR/firefox-118.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "cd42590e111f426d607d3a18b1cd27c9b691c2d02800f747c8edbbab8f5e31f1"; + sha256 = "f7b02a0c1107353d425d257efa9a439d623db79a240b20a20db3f9f2f7b6b014"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-CL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/es-CL/firefox-118.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e8986d426d4bb3a93ca8a084ddd2994c1f876f04c88c9143ce4d6758e3a29ec2"; + sha256 = "fc5ff3acc88d6402d4ae21faddfe01a924d222bfdf9ead2070a5d04696cf842b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-ES/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/es-ES/firefox-118.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "29ed9a0a92684f013a86aa84bb2f897795895635fd96cc3cd6b977dbc36b5449"; + sha256 = "4f8166c6d1239830d09263e357b48518c1a497e9e12b2061a7068482bdfb3319"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-MX/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/es-MX/firefox-118.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bcfed213881bd7d2a3fbc2f477d63fa17a614cdc6b6462d20d27ed447d5d58d0"; + sha256 = "720e71779daf104f4ea35b318bc99cab5be6502b1e516541bbd4c34a7388482e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/et/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/et/firefox-118.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d8be9ecdc37b2df6bb14e20030cc44c116d070f68886825ae84bac95b8d2040a"; + sha256 = "27746cf9015f60342e020db90676520847809da3fccca91f093d08c642ddc785"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/eu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/eu/firefox-118.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "59ad82bd51ca20192bb2e083a49e3af4ab5ef9851b05a3c553306a435ed22d38"; + sha256 = "8f2b85bc587f56571aa7d229e8d556c29ed86ac9cdb6bcfa7dc3e98f20bf280d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fa/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/fa/firefox-118.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "78a469007c15a02379c5ab8883134e40f4d4ffe4a09b9169d4263cbbc98a64f3"; + sha256 = "9ec2f8867599687b62ac29cb1ece1cfa322558de18cf2af032ad33a8b3274e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ff/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ff/firefox-118.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "33d4f8bf75b61ae0480450385ec6a5a3370a011f82ec626b5805052111f000fe"; + sha256 = "918894a936dd797ef893ca6ee10040edf2e8085bb7ee6f5c40cb8c282ac06af0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/fi/firefox-118.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b78e9c2dd1319225ee966c87eaf36deb8b7734642b7122bf89d3d9cd7a8b3efc"; + sha256 = "da049890a4d76dd7bc01713565cf167088d899b086edea9af6e9e8bd7e4c015b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/fr/firefox-118.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6087f7fb5d7d898f86feba4dd176aebef55b5cb83a79606f2587482d2113c908"; + sha256 = "d8c2b59e57e18f955b8bdb01cd601770c0a1077c154596deab779991c1ee767d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/fur/firefox-118.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a76c39c67d956d1a5a399ad3a951e7ef85f873d4eeb4e0f0447e27482a8aab31"; + sha256 = "dc3545f9ec092808a8d341052bd52db9bb9d8cb0c56c6fbe7b2a2e0c04be996a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fy-NL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/fy-NL/firefox-118.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e6f2627ad2e47087e34fa2d7de27b28dfd859184cbe717f6ba3b1230753aac1f"; + sha256 = "efede9fd7daa9880033fa8de7611389c53a96ca586731da6032874fe19d554ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ga-IE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ga-IE/firefox-118.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4cd79d5097fbe4c1b8da60fb7452ec040e6a7404be83af94b3fc7bc430af93ee"; + sha256 = "ca8b04d318e2ef9010c5e228bb85f6fc987b34061eed72dfd89e86b693b80d5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gd/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/gd/firefox-118.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "58ea0722146548b82498682813c3e9ae0aca7cefac15829eb6251df6a09cf989"; + sha256 = "f02944ba125f164e326e30076d075b7aa5e1428a58ae653471e21c18efa14815"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/gl/firefox-118.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bab03a33af0af44c76a6c45d441060a749bcf9795c35b7879996ca7c229ce9ed"; + sha256 = "43e0b73415c5709bc0e4eec4d976414bc132ff6aec88ac0c91e32eba35d91a48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/gn/firefox-118.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "c4ac97bb3e86ba34b0167a1a3370c36b092a0eef0d4d85a04411722fa97f9cfe"; + sha256 = "63ba83c49764c048e2ecb80ece86b32bdde3210869c86988859b13ed8889ac55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gu-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/gu-IN/firefox-118.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "92f267e5e1470e142de0ad2b8679c9021425cea37c7de898f918548bbbe0b46d"; + sha256 = "762720e0dac24bf2a54d4682303e3ec86cac434d2acd0d9057133c4792d1b023"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/he/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/he/firefox-118.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "773a53545da52e43d96c983842569ae1287494bd0e7363fff62b950fb454e542"; + sha256 = "7625aae6e86e741315f2471fa224181a9e567fa03a3afde3950cb92988d2d099"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hi-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/hi-IN/firefox-118.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "403c66cb65fc2bb38f72d0483860e6667d5ac0235980b8b31404379908598f85"; + sha256 = "019bdf9b9a495e72aab32e18f800779ac905d332c6415f879631755ab66ebb57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/hr/firefox-118.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "2048e4824d67d4e9b2b7b5517a6b7a5a3e10edd9893bdc59e78602ba7ba751c5"; + sha256 = "50e7132013bf877e66d2317fc1cbb422ad18a0bc96ab267b5f3a293fde74acee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/hsb/firefox-118.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "64dfd241702dca4923608ca22494cc422c36a78afd8633cb1b38e1c0206339c8"; + sha256 = "33a14b6d172f887b076ea1a7c27af9dcb523ad25fdbc3156df5cc93c41f946dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/hu/firefox-118.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f1dcc54e3b165ac6c9a5672427dbf07b3ce8a464174fd0561d31945a6da03c46"; + sha256 = "113278d411943fe2ada30d1feadc715bc44686d54aa8744e56136f8d9c48f921"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hy-AM/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/hy-AM/firefox-118.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b7675399988090dca87e08815d80fc9c3626fc51323c60fd0c68f6e2b0317ebe"; + sha256 = "19d1e5b76b00e17ac19c1834822a9d3a4e2652131f2e71a4484e3540eda0ad94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ia/firefox-118.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "aa7202913df0bcdc25df93ce730ca77521736668de2b057cd71f41888056dfc9"; + sha256 = "2416de43d01969463be4b5016b4eb4f5b47e8b30b3b7b858c57a2759a4e234ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/id/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/id/firefox-118.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f5b57f8b7f7e90c875a3905d12b18a6a50581756803f42cd5c161fdd8dcae278"; + sha256 = "cd43ee8b0559bb125d14da0ef2e2cfc9d222bc9b5cd15e60b099aa6fa763569a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/is/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/is/firefox-118.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3961d574adb39f68b608dcd45d1d9060e22ba06fc894c0a4fc91805780143b02"; + sha256 = "c198c8cc3a0c8ebe6fc51c16e2383d9cc7c7355198440835cc5dc25d3a26b9e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/it/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/it/firefox-118.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2b5121470b5eca3b09e8cd59471a3aec55a416edc148f11227d283d27d2c11d1"; + sha256 = "fa745fd53fa2b9635e82b35f285054f10569edda7f40ffca2b8b3c1709781d09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ja/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ja/firefox-118.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d0a500a53d93eb3d87fd5dfb9d47a2bf82dff267144477b9a279c346c0f3b012"; + sha256 = "3f6ff2c2c1af8e30c2f4bc793015abc9bed6a3294c7a83da655c9823c24b109c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ka/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ka/firefox-118.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "76c533fdd82f6ef8f3f26372cf203f21a838174e948b48b2f89a3602af0eae50"; + sha256 = "0bec125b404b28f2a324df1b56b16b0c87736b04c7cabcb1133fac53113b6fdc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/kab/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/kab/firefox-118.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2e32c95bc2c92c4859f3cb93995e08ee3f345b90c31157b57b13ec8521ad2146"; + sha256 = "0c97635fb3b84aa5273e48a7e085c326a74b727c4ebca6bd98c46c500a0a3bbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/kk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/kk/firefox-118.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "17d7d5acd90c005e07660092aecb92601e0dfd227f44c460f4e5d7541704f81c"; + sha256 = "d39b178189d0f000173f6e092e2580582ad68c043a30575c9e3e209c6cb2813a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/km/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/km/firefox-118.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f14f332973af47ac3714b2822c88b55f9412a33935ec4d7a5d58b62cce13f8e7"; + sha256 = "fccde21ffb99acadea9ecd17751a123d58144434b9183bcca5095a6618185be6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/kn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/kn/firefox-118.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c32350aa7c40cbaf2092de7c3e25288f98f3917f933ca787ac16d948d0cb0d2f"; + sha256 = "19b731e7f00edbf54cca1fa8d945d62eb4bbf30a2fe8c289310f0e5e3d7d5a3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ko/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ko/firefox-118.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3e3fc8664a85319ec3c8694f0f69a943d3d72f7995dbf52a389a13a7869feba2"; + sha256 = "29fa6a2aee6255adf3df55eff67e1296622236fd2ff2a8aca9541cee4fc0277f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/lij/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/lij/firefox-118.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "fa5a4e03b3dd82255e33c531784691cb07c98c770445b4992700d11fcaeb7c0c"; + sha256 = "8d6ce19adad75007150955424c1242c612b2fd1dbdde59eb8eb5eb845d5faf29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/lt/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/lt/firefox-118.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "97bb3f0ce856fcd9526f0601280d5621902b4a123e10d2cb7438d2686694d7c4"; + sha256 = "ec94bc3e7bd804cdc8088e63fd7127d2dfbbdfe589c26648794df903e610647d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/lv/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/lv/firefox-118.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "461ac23e44fa7ff9992134cba28abcdb6ace665590f9a6fde293398d4f1a97ff"; + sha256 = "5a8faf8a97b02c1cbac3c2bbe93fd8f12e447503d22bd5d1f49fb451ab90ac7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/mk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/mk/firefox-118.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5231feaf4f03931150f3c8efbf76eebaf6b3989c9d9f2fba9a3c3ceb96378ad7"; + sha256 = "96264320dd34cea3a931e3e27ec4127e38820c76389b20f28928e46aca60096b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/mr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/mr/firefox-118.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "fbea27c3f30006571efc5a04b36c7ff34fb6b5665d0cf05d05a7ece70063afcf"; + sha256 = "e404fbe3765ed07d4c1ab4947e29f8e524cd40f615d8b9764616aecff5344a9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ms/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ms/firefox-118.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b210d2b88f9108880f41ef02c5c75529d53853828fc0aa26588d30c7e5dd4754"; + sha256 = "61e90065f6bda9ba1f27cde6d74d7365d9300a28e3c9f7a57028deda10ebe9fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/my/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/my/firefox-118.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "260ecac1fea5671b769175cdf92b6c0be5f64d30a2cb71d9fb352d39db2e3439"; + sha256 = "837eb4047033a632041904659db4cc67623282138fd3b8fdbb161deb36122959"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/nb-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/nb-NO/firefox-118.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b3795293e9684677c94dc442ede2d6bba309ba48ca79d7c8d1eed33d5d2854bf"; + sha256 = "a7c61a3ffb08c2c26a9d364de184cf149b4834dc1acb8bb259dd8a2c9e477cd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ne-NP/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ne-NP/firefox-118.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "53c2628a86d456d2954777072c0e6ac30d85b7714c8e3a95364955fc07270b99"; + sha256 = "4b729cbbcb56454b2aef3ffbe44c3e24bee713b19abcfcdb19ee1ffe7d8b1c7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/nl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/nl/firefox-118.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c732de95a1e10e4fc1831d740e782d6a268bf0eb7196cd2ef4a549c0cbc3ab81"; + sha256 = "2095d95bb5e30cc896f363c7f9f13dcc73328386d827a600ae6f0d5f5343dfb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/nn-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/nn-NO/firefox-118.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e2220c2548a9265beeaca69c9b9ab21ae238421d46a0b08cab11914986f89bd0"; + sha256 = "5ea640a0e047b2296461cb029d07029a25979c8a203a1c0a4ff67ed14e3869b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/oc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/oc/firefox-118.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d4c85b3d2e87fa8699661e4ea8f2481bb05888d30c33a6e457f34c77da65cdec"; + sha256 = "104238aa1af5f1028f0b89eea04ab99dfe182e9f2209ea3171c98df2c1044eb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pa-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/pa-IN/firefox-118.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f51d558b53650b2a9bb325081cdf1168ba3fbf7cb8668c8a5a8e99d0616c2f76"; + sha256 = "3f058ed6075879071617a6167e6107fc5da9003e4c47885acbe950efa2e8781d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/pl/firefox-118.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "76b5ab1b8aa4e82fb29ef152c103529cb15c06de0a256eb2decf7ab5476f42f5"; + sha256 = "436aa45f32623ac3ce912ffd47a7685922e40aac6b27cca771eae7d81d7e8254"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pt-BR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/pt-BR/firefox-118.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "90447a08e0d1c707dedae731b5881415421391c1969db744bd65003cee7657a5"; + sha256 = "079f16881087407a379ce9a0f87d774c0adce8c9c1401e54cd6acb47e9182ed7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pt-PT/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/pt-PT/firefox-118.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "017f6a56b39b8abbea5bf72a11ca2a0f6630956e234981206c96eece50147c69"; + sha256 = "9162bfc7bbf1089dd458d99e16e272d026fe1b65c9db4fccdd0715a6f6565bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/rm/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/rm/firefox-118.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "64ad854a79bfd50a42a3ea405b93494ab4bc10525d811e66c2acd75a85e14834"; + sha256 = "d84ce9272a140bd4b1c9cd91e2edba07a4bbccf7d80be4c882c7a928d79be043"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ro/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ro/firefox-118.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fb0336084d8e34fe2fd321eb3ad2256c2718442936e34b12479aea3d05edadbd"; + sha256 = "89a6a23f9d686380f10cf1f48a9d331145e339171d2452f8169b431c103c0c75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ru/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ru/firefox-118.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "763b3534433c0376a65f6c0e065d6dce05cbf03ca95fe51087cb82bdb8ddac87"; + sha256 = "50d4c39448e1711d8d142089029374e526e53b7fde7a375a8cdf7f37a57dbe08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sc/firefox-118.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "1b352e4edf8ef5067cc1ddc230fb907f5246ea612898a0c4f0715442f2ac7f47"; + sha256 = "12e0360b476216840c4e173d06dbd22b14d16202621e4ad837de0eeada37d827"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sco/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sco/firefox-118.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3fc7764ab6b13bdaab3f9a990ab7b2337500a24603b31ef65657c27705041783"; + sha256 = "cadb91c6227404dca8f57da4daec9e11ba359ce36d5293b70c4c5c813b671c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/si/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/si/firefox-118.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "79255e4967614e18f11ddf3b32a5cf87058a01df12edc5f04671411796bd4844"; + sha256 = "ccb7e7d0a080875f1dae95448f9e91ba9d3e6668768ca2b47bad9c17218714d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sk/firefox-118.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8111813b6247526b6ab97aa212275f67a8b70556a7565541796cab9700dae295"; + sha256 = "983513aba844f3235d4c44914c3fbe74896179148b94bb99845a7841fbdc6f04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sl/firefox-118.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c79c7b15b0bb3fad4b2fcb4cfddd15a3a43e6469a56b8557240700c65c544a28"; + sha256 = "7bf4eb67fb271878f408bfb4f3c3c0b81482310a681209271f7b531097f50aec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/son/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/son/firefox-118.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c14447b86bd4b888db93ecae8f19e7e136365c6f8cf690a07cd5cdf74ea9e58d"; + sha256 = "1d9aebc2a1293476a02d30aea5fb9826c3fa2709e6f557769607af7daa666cc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sq/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sq/firefox-118.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2575be23194405bfdf20fc8363f81b148b02081f26231977bf6032007a235558"; + sha256 = "05ba3df5565f3d4364a66433340b95ac7bb2ea8fb8ba1defcc97e6d65cc0f04a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sr/firefox-118.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "018f214f645800c738edb612ac4ff8cc806b382a96a80b720cb5d87607574d44"; + sha256 = "97055e3ba5f16668aa80bcb3623e33a36871f4fbe0815b6c2c57874ceca415e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sv-SE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/sv-SE/firefox-118.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "58d136a8a9e9dff6fc4a84a75055a73e90d2da68cc2676863985095691172332"; + sha256 = "011c426a026b0b29bddf03151f190e9a945b9f550765765040e4bd9937939a5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/szl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/szl/firefox-118.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b1b76d0cc40f6f44f277db0b15e8877f54f137dd24614095273322b637367d10"; + sha256 = "e22ec42c473ef1e3b81747f39de3a6ca1cd8382868269b57400fd007e76ee215"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ta/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ta/firefox-118.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5efa32abf220da9c35d760bfb3bc46aba03b4f11733751821dcfc85b09ff58fa"; + sha256 = "96085dafc0374c5452ad845008ea385fcecf8411580c8fdfdee720b2b63675b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/te/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/te/firefox-118.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a20aec40164aabfbac2e2215665f8bbf0f3719d0317b9975a6f094eeb7d665f4"; + sha256 = "864dec21941db9d15ef3ae0a6faa2607ee96bcbdd8dfbcc8be7cdc1f42a2f798"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/tg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/tg/firefox-118.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d7f8de05aa85b8a4a7312c6a217fa9ab6cb1765160dc0d45742bb2de9b6497b1"; + sha256 = "b275bdc0e2aa32e1d6fd29761eaa1968b4e8e0a43a60b42f00fc69cfb6921e1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/th/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/th/firefox-118.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1bcd53cbb98ab3089b1175cc808c9781033a792e786604c13343b2866d3516c0"; + sha256 = "3b49e8486ca97e8ae4be0552e49d45db549de9daf5691a47a83f06b383a87fb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/tl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/tl/firefox-118.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "55d52bae09ea4093e1eff96585dfdd477f908f1071fabcfc1bcd13354b94de1a"; + sha256 = "f99b0c148d5b85a9c54d4ee1e091c67bd1e6259b52c281afd7466fbb31456391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/tr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/tr/firefox-118.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c57af5504418e23cde3402880be0d3797a186aa56954adfc2f3c0ed8942172ae"; + sha256 = "b1edcf7907df0e626e266db027b8c3776e606ea0a159acfe2b7827e6279c6706"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/trs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/trs/firefox-118.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "409208e0f3f3cd5e25297f5120fc933ba83dace1449546589a97e62ff0dc9537"; + sha256 = "1f08453817881c9faf7a1c27205b514d398fb016f6f6c3a3ca5f28b04059f21d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/uk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/uk/firefox-118.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "df08ed863cd7d02e021953290ba609c8d00f63f8c03fa3c837ce0f6bdb121ddf"; + sha256 = "55e3bec5c5507d7ed55c1067f53f240ce8e5c2aa072efdb9ef66876521c6d058"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/ur/firefox-118.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d549573c3571d0c20ddc6c3606d1a4784a6886a757943be423814f9f3e847061"; + sha256 = "c7218b596e17cdbed78bd912b64daefe1de6d0ddb89967c13aeb5b9531994d7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/uz/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/uz/firefox-118.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a09b51b30f4152f14e84f4590772daafce02165e1d314b70447cf09985bbd13"; + sha256 = "09b671cc2f71c4a74d00026cef84ca562f8aad0b54199de1199bc0424c6517e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/vi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/vi/firefox-118.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cfe678b674c001b5818830be0eaf36cfa2b0ed31d005c4a559ecda2dac6fcae6"; + sha256 = "5e0ef08b64b6a84d84419acbdd0905ba1b0ec01847eb85edd85e7c77116f5df8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/xh/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/xh/firefox-118.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1c7e9e390ddcd9e006f86a5f645546359fa73c1c0f04d3504085bbcf3c82d74d"; + sha256 = "f4a57a9928581150a502c961f7e2d9f1e53c1fded1c2843bd7f8ba6243ce1587"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/zh-CN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/zh-CN/firefox-118.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d7636801fd5fa862c7a211f21ec7666eaa30c75d8394ede2e471a6671a9de2f3"; + sha256 = "425a515ee30acfcb9d97559b1a5d9da1b39e168b0cd160db8ac92e5f9aa16e4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/zh-TW/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-x86_64/zh-TW/firefox-118.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "84786eb39341069a27ff31e4f99534bdc1e9d581f48f94234f90f0fe97c548c3"; + sha256 = "b262cc5a28d4a52016c2a4cb0420b60e7cc31f5586e105a88ddcb29eb28b3c81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ach/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ach/firefox-118.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ac3c882130b37750d3ab48d18443a140173220b14f6ece8de238677c7dd00d3f"; + sha256 = "d434a5ccc10486b9e300d29476a396f2e93a32a736ff7cf35e382f55a4077a5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/af/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/af/firefox-118.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bbbf07ae28faf976e4c4cbf87d5d0caf079087679958b43affa019ea8896bfad"; + sha256 = "706de47249cc23d7779afdf6b5d39a869fa9a5d03e6849234d7175ad3aeac6f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/an/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/an/firefox-118.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a82e2846b4ef077659f888d71ca415bf4918ab8f2841abb926ca8f86e6767b42"; + sha256 = "5bbd75b2459692e4e336112acc6204711747ad5981ac8b275e1cdf5ab2157aae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ar/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ar/firefox-118.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "107c2e66caef41e3f4e415f50842eaed1a1f02392f3514d60193b1cde6b0a340"; + sha256 = "50925f2b3de5555784609f54fa59e1d67c914ead43b93654744a897037483745"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ast/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ast/firefox-118.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b5c862ad4b1072433eedc82f4df4c13fe7e85b88a19e5b4e1772df01a64db916"; + sha256 = "a11ecc3035ee35932b80c4237cb21c33468538cebe7c29d15fd5b0edf9d37891"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/az/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/az/firefox-118.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "dd43d0cd1897863ed3a2df05af1bd00ca7332954fdd3672f67ba7098691b7b0f"; + sha256 = "9ee4a345d62257506141eba25962040a662d0257990630ffd3a0c2b31557f778"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/be/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/be/firefox-118.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9badec5971f42c054618c1f6b86df5771278b07a44d8a345271b2241e057c565"; + sha256 = "dcca5d62c38922f7120a301c5432700c6b55c7fac14dc4ceebbfe564e82fd353"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/bg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/bg/firefox-118.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0499c5e2b00eaa6df5ed88f699811d8a4d59ab232489eaa49a8ec3912ef4e295"; + sha256 = "bdfc61ab7175a7f90655c5dcd3ea218825e9ddf2161a08bba01ae30fc0332b3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/bn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/bn/firefox-118.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "b65f718dbd3400e643f059e62cc46104e9ea6545f79906e81ee796758571a7c1"; + sha256 = "d6a60d12db60b7257a5c2d53f8dae6c41272ddc121aca5f65eec757d770de97b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/br/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/br/firefox-118.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b07c8981ce349ffab9c918dff7f14e11abbf47efed549085abafeb27c1d1ec74"; + sha256 = "a91878968e8945812474ca96a70aadd06489885f3fd2f24107299c6603e19241"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/bs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/bs/firefox-118.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "90bc7796ea5a98965f313fbfccf892293d1c853b40d3721be646d19ead56d730"; + sha256 = "777b9823894042c29fc258f751615a3e2866cba3ba41e7054966b48179c4b1c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ca-valencia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ca-valencia/firefox-118.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c2af61e1b96a963afb0990c5604b25b9b8a5d4de3cdbbfaf0f146a710be7df8c"; + sha256 = "3fa975f3dcd5fe3cf978a61a1a153121976fc04cf0fa45a591b2bcf91ae16f87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ca/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ca/firefox-118.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "270a4cd83f9aa805348e40b77ed02858a78a72ffcbc11959e9abcaaceab8f969"; + sha256 = "cab6942616b3726be26b61ae879580768c4224626088f8b3ff76c12d5560482e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/cak/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/cak/firefox-118.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ea1ca329e0ff8309d24596ae2bacbb82e347626844e66aa39eb4c24b24a59b26"; + sha256 = "6da06a2f632b0efe2a6ef25ee5ecb0f9530581b39ea9efdef40c6884b78a16be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/cs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/cs/firefox-118.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9f4fa709af30679b779f2ccf5a59cb667fc6a94239f80b3503fda365b08da4c4"; + sha256 = "a88005e8f253b0d27071936914506be070be4c40696c23efe74f7812562d08f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/cy/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/cy/firefox-118.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d9d32157acf6c3c0d32831b0f109c75bfb0e93e4805e8b84ed98fd79107254c6"; + sha256 = "906ea81402f42e23c9f661e272cf7e3fa6f915dd89ff54479dd7e1aca770a7e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/da/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/da/firefox-118.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b462ffdf869d7fd924708f0118c1aeeed83147d7b6c0b9e8b7e157a45cffbdd5"; + sha256 = "bbffd4fa970e256c8b4f5ff2f73c9461365b3202d6a35a846e99b0af7104ad4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/de/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/de/firefox-118.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "717ea34412ec90e31706e88a798907cd0d4da2f9a45c68965e11d451644ae503"; + sha256 = "7a84d8be80baca7e588510c262d7b5a36d43659e4fc7b205810e0f0bbc82b51c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/dsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/dsb/firefox-118.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1cda72a69e674ac5eecedc64718555a9522695d38093a338a38a895bb8d1c40a"; + sha256 = "e24380290d1cf9f3ff581d84fd63ae59af374d8c16f3bda9399f431fda923d97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/el/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/el/firefox-118.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3b36d85a9213e1286e4731be02ec0d4fd959c80aefd8f5cd462c7489a03cd728"; + sha256 = "6add316dd833c701552c11134d1503b3bd13351cd24e8dd209477ff9e9c4fd7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/en-CA/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/en-CA/firefox-118.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "57071ebf1838ed52fcf0406a9c92c03ad8d92710c71dcfce4aeccbcf92e69a34"; + sha256 = "3ffd921084fabf35b75b84edc69cf5ea47e8d81a057aef9add43b66bb7b246f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/en-GB/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/en-GB/firefox-118.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c6bb0aabf88c16cde1c8e9cdc084b9392559992d4ac2632487f4e02e04fe645e"; + sha256 = "a8eb947e370446ec58bf238c98f961bdeff00075d0bd96f782c4e4f4f0978d83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/en-US/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/en-US/firefox-118.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "946bfbddcbf7f373cf597191470cca704323081d40b79240a0deffc47da485e4"; + sha256 = "19f3e62bbdf75170157643af4107a48fe279ef85bf890ab65e9794a364f86aef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/eo/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/eo/firefox-118.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e7a7d1d04818c5446c415cd42da9f9861729672ddef665745386bc8cd50a75df"; + sha256 = "f91bccd8d9ed87133af124bb2373b5f7288e88ac540ab743d5a654d39be53e5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-AR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/es-AR/firefox-118.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9cd56ba61d04cd7fecbf870d51c71c3ee73fc40c95f58082cf63bce39bd52eff"; + sha256 = "c5f3d5471958090840ca774d0e73dec0c94919ab1561b6db00482d160f4caad0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-CL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/es-CL/firefox-118.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4eb297d641094c32f60ffd97231276a40622cdff051a9d404392361eb1335350"; + sha256 = "6b5bac7936ab2d7f64a7d043b81c971758a2a05eb0c966abb9447ef3c0dd878a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-ES/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/es-ES/firefox-118.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cd8b324ba4172d4674ef5a3dcca6578e69afd60c865620a14eb8133ca6b090a1"; + sha256 = "176e4b8f486085f6e9a28a89d5aea866e39ec8f3d314cd79d9d075064a04c25a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-MX/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/es-MX/firefox-118.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "aca1e6539b860868136de21e7bca7a95294378b8322d66a02ab8799a6fc4c62a"; + sha256 = "1e29ca12515df142587db62fa1219dcf88179a76f5f7dbd0b071ea94a52720fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/et/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/et/firefox-118.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b3c1b1ec5b65326023e35841f255d7bdc01c962c7e25cf94cee4035c88b0e84a"; + sha256 = "0b73427884ec1a616fb135e18302f20b0a7e861dc14e37b9273ac2de5eaefae4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/eu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/eu/firefox-118.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "88129d6df309655acb54488aa58a38a36360396aeaeba1676ac5e487820e475a"; + sha256 = "32394e220320fabd301883d17aec4369e49d3a2f42d860875b31a031c23060f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fa/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/fa/firefox-118.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "abb3d073811dec8f9156832cbef0a2179df8b9247052dd6cfe3aefb12a1f1298"; + sha256 = "c22115752cc0e46a2712718830f89723d483ab08610cf4c165e5312aae7140c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ff/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ff/firefox-118.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1ae27af807445715e9886e65362949487c39e27e934898af2b951c8c3b1ad23c"; + sha256 = "7c877e8ab903494cf018ed2637239f25d768bde06dc560ae6dff615189b85b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/fi/firefox-118.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8e3822f6f36a3b29d7e8626417376c43c2fdb2eb0882a62bfb451d4e74e49d81"; + sha256 = "6edf423d66b20be45caac27dbf5a6f0323cb3096a29899e6b40df2b307466237"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/fr/firefox-118.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "baf787fd2881ffddd1d13045aa0b12ebd6f26e5d7a9b15f6d0178dd16e2f9c60"; + sha256 = "bd690f73a981dcc3c127f459951916b1ee7238ef6c9ed0ee8213b89dfe6f3d42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/fur/firefox-118.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "2da0f32811479ef389cd7594a375cdf0438c6126e142a93b4b9f456ea6124e88"; + sha256 = "e0d462161051a1c64eb4a7b6d85a437d4634b8ca39b7a6810012aca4cb88756d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fy-NL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/fy-NL/firefox-118.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "36b7670fc2417f732e62c129dacf9cccc3fd38bcac5ebc8354b4db69ed6357bc"; + sha256 = "e1d09e2f9f8f885f44d0beb80c6accafaa81c1db386e27f9ddc78f66b110085e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ga-IE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ga-IE/firefox-118.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "865b29db4fda9589069b3a9b05c2d75850247cadf56faa816536383381292032"; + sha256 = "e2856edf8d0d32ddec1b40d9ed85087bd10a7102bdcc2ed293662abb8bec7d06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gd/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/gd/firefox-118.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2233ff73ea497ec7f8eb3db41289a8a488e21fb43966d2bd6ba3ec6f9bdcdf14"; + sha256 = "3f77584e25bb7ba7aa331660b9e83c42ab2ab8b3dc6091d22d71a4b1aa277ef8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/gl/firefox-118.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1c3fadb78c4b292302ccc545d9bdb7f3750517487db65e6955fb1d8a159215cb"; + sha256 = "32d0c334d9a819b5aaae007820c3da6c22b616294ddaf4c9839724ab420dba15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/gn/firefox-118.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e0d2c1859907c0385aa89d169c8bbe931484fca77ac28c27f4735e6d98b009bc"; + sha256 = "9781f37adca7183a4c1bf3199991db5bc0de6316f6efa28e37082ab57a1e72cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gu-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/gu-IN/firefox-118.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "fdba80a44f6a82df974894f59fbfab1dcefccd4e710c6377152f8fc025cac06c"; + sha256 = "f12fb3f131e848548b2783846c198f5f25143d47bc3ca3525c0984305342361c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/he/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/he/firefox-118.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e0d2571389cfdb8191ff2fc796bd062b60b6c56cf0a5d2897896130edba96519"; + sha256 = "7ebd17995504829e5b785f5d92107a3508619a872aba22a8826340b266c1921c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hi-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/hi-IN/firefox-118.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2061872a3adca56a7c8369d44bd9612507c3ca83d0b463380b520ee9c88ad63d"; + sha256 = "e4159007d12321ad64026b3569400615ef485e8f7f20622a02888e3ad3f615b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/hr/firefox-118.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "7a1bb05e721957798a72f4703faa0a4b72481d9586566e7dfbb7ed01b4d80fd7"; + sha256 = "ce11cb67cfa07a63440b42e5412052047e14c610221234277beb2e2c3a1d176e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/hsb/firefox-118.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b53c89601cd7afffd066f0737d03d5404b97e2edf6dfdb4255abb09d4b798e6b"; + sha256 = "4c64c58b9a0e407a6a90008e73d60c80ed6891ac13b5aa3400668e113c355dd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/hu/firefox-118.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e5e0a738474a14a22c637291f7071019a0cc8129164383277fe2d87b48df6b1e"; + sha256 = "33702452e97d7283d28f59fca52aaefa472c79e4825e5dd89c33c02a8024927e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hy-AM/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/hy-AM/firefox-118.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2acf47df4c1961b2eaafbbe169dc81fe717cc7568bdd70834e59ee607ab4d499"; + sha256 = "7188ad2e5c0a1cd5f088e549a08873d1716b94a4cd4421fbf38e57af2414876d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ia/firefox-118.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "121a35d0584208dc36cad8633751314c518fd9160d36c487f4c22f80487c6d0a"; + sha256 = "8d42056e7fa144900af8527373210869e66b64ee8ea4495b78f58491946f3a00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/id/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/id/firefox-118.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a63c847bfbfdbdb54f482bc526d217a3d9e62c6f7da224bcad490558c031177d"; + sha256 = "c59fa3ffbaf156dabc3188adfbc276f6a1e239bb6af380844dc29226e446d3ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/is/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/is/firefox-118.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e87e76e9e2f4b3ae8a6b227a1411808b18a11891a8cbe835bacb0b99f0f3d348"; + sha256 = "8e1307213d1067c0da79a843b8889deff3a58bd357f997dabeba4c0be6e96150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/it/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/it/firefox-118.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3204ce295752fa450b515431ad62b1a2506b77a5e2d8118f50a8c551cdf121ad"; + sha256 = "3c9694149062b1347ffe6df41d1e27597808692810c40b3fe70f1ff96d25b917"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ja/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ja/firefox-118.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "50fc16576bbe98de00d63e8c79b0c41aaf0c013548bcd2222b911fcf1abab564"; + sha256 = "f004130f1c05135d170109dbf6704f10b2444d636c65a6ef99e558e1c531cfb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ka/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ka/firefox-118.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "839e73f97a4517a39484b190bc5419bec36d2065101400a489af1f4d6f2a32ef"; + sha256 = "9928b27c35ce5bc1001a22c5ca018014e300d0615e42ae639d868f6a3df20398"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/kab/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/kab/firefox-118.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c2585304255fc4550510ae3e826745bcba0e586d1eb252675f5eb51ef8ace713"; + sha256 = "155a1ec0ed93b1bd25021e2be02084a5c13961576e45d1d38cb9b7af12ef963a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/kk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/kk/firefox-118.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f7ff22dc2094c824c9e2e1585f1d79236b301b0dbf862f93c0de47ade0c1df1f"; + sha256 = "a06e2d097751bc5d95ed8cc46c6b74399eb390458e74d865b59096c6f056536b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/km/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/km/firefox-118.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "65e6263a990c294acebcc61581ddb1e18c5068d59ded08b7d57a47eeb8c43486"; + sha256 = "9d9162449f3ff9abe4c8390623a58f3f2284a0c844d91b243e77976ba8695471"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/kn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/kn/firefox-118.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f0d510b70df7a89b81e1eaee4aae39e958dabd59d03db569e79f33a7d56d799a"; + sha256 = "df9f1153fce91189fcc1667b9f28fcb834ba7b4587d287393619d959f363d1b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ko/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ko/firefox-118.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bc6741b5e0d7e712beea5e9a301dfaf9ff5d42c1050b43c0b354bb673242e207"; + sha256 = "2f38ec282eedae5812f27d1b123880ceb9b3e8f4ed7d844345b82d9faa9f8da6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/lij/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/lij/firefox-118.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "b5767b9b389cc68dd9b4fc8d869dc2517d312ed9d6aa9ca190360b376807d9f3"; + sha256 = "96b0b4d3b2d0c7541fe46002435177b3cb2c3a055e616219e9a545b123a9d4a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/lt/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/lt/firefox-118.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7a0d7fb9a6969be6e4fc87aef20bea9c4c8359a9608e5a77f63bb2d4eb774182"; + sha256 = "c09c0559372c9482bb07e304e43579a046231f492ed9b9c7e2c3423f0efcaf5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/lv/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/lv/firefox-118.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9302a16902d942ec130dbfdbe2bd147bd5155f5ff575e23023378e76625ac3f2"; + sha256 = "6101fbf1069c201c0f4102e61b1b1ea334575871ae0fb1cc4735bd72d76bd9ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/mk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/mk/firefox-118.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f7adf51124738ab260edfa03f12b70644b5aa813460c91dd454af8f593d7806a"; + sha256 = "9260256fe92f5d559bcb1d855b05ebb7a4e6e231bcacfac62bea5b3009a0effe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/mr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/mr/firefox-118.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "7612235ad4d915d367d009c7d160bff107d4132b92b16d8e4d4f76f449e0eb4a"; + sha256 = "25ef6be9b01c73f693b2b1b6903b1393a73a7140433c249957e60bb3650b0354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ms/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ms/firefox-118.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "7bfcf302486c52310bc6c23cdf955b114d431153e46505e5ebf3abe45f1158c6"; + sha256 = "b94550021ec1404faa13461124f7da0507cbc6e0fe5b99db332104db2853e899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/my/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/my/firefox-118.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "3de439e7ec33d0a98cfe1f0d2b8a96a0350edadc2698474e2a7520ac9dc5e61f"; + sha256 = "a8e99ef722c488536cc1c2563f92c6b05b6587fcb8a767f112ab35a1d53fcbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/nb-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/nb-NO/firefox-118.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ec1eb9cfb49e6250e3ec1e7d2918a98389315075d7c5a71184605958984d08c7"; + sha256 = "bbd98c0c54b0b4930a7b92a8eb51caf1158373b25aebced96ef3864428d92b7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ne-NP/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ne-NP/firefox-118.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "bd7f0e873a22ee7c8539292b8731d27230160d2ba7a3de223cf357a468c6fa66"; + sha256 = "a0f631ffeaf864bc5e7cf705fa43104b655dd820ee3b2d5b2dbc077f814c712e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/nl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/nl/firefox-118.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "37c3289c522d84a785af6afbd1af6d868506569566234a306775e996928e5552"; + sha256 = "e8e71d0c7c58477c13d214589ebb9d55e2a101f348b8cd561b242080eb7246d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/nn-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/nn-NO/firefox-118.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "4d977db9e140b846be1562807fb9f4dc72020c25e93fc64428e819c1df1610dd"; + sha256 = "87da05442ade8543def90be243c168d185d6fecbe0e05f3a55e514ae47ed92d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/oc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/oc/firefox-118.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "b642f568fbc00c7c12148e415eac9cae767c043e058c8c3c416cb8b83d8236b0"; + sha256 = "31ec4623c4a6296153afde5524025d71a5d96edce876f5f7947a196ff4181eb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pa-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/pa-IN/firefox-118.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "aaf14c69892fec4fbbf7b93cb01dba86eb26d744eca74e61753c15e06dd32d90"; + sha256 = "d013dd441f1a607a66569d2ee6173125b8e434b04cb357a5c2b2c468bfebae66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/pl/firefox-118.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8d7fb18457966adf7ee53459ba8c8faaad2806bb228d3b8acd37dae30b50161a"; + sha256 = "32cf964094d0e68db104115ab4b340e3e09ea5f9efe96ed05c1f36d5744ca111"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pt-BR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/pt-BR/firefox-118.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8a2c8ad808982f53b953f1b3fb34cd7e829b20d6fc298f7c734d0b6eb158634f"; + sha256 = "cff3b49ec49b92f922fa45318fc0b4b605896b14268d958fb6f9baec44e5353a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pt-PT/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/pt-PT/firefox-118.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "73e82c20cf4302427f99c48be6ca10477a23e9e174d960b4267f4ee1d8486beb"; + sha256 = "1163a707a91c1a0e33f395c473440806335631deb3d5f6cb1c85d8152069f839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/rm/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/rm/firefox-118.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "54ace8e61c0bd0788a42ac03c665aec1e65c963c30f2d26f39cae1257a5e6ef4"; + sha256 = "58f23f5aa78a5307c7bdeaa34cd1652aa3c7c13db056b5f2f62715f21d928a95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ro/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ro/firefox-118.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "37c720f62c5c66f393d8344781db87b38cb4ed13089a8bc0ec45cef3e49b9672"; + sha256 = "226dd2338448be1d4ed0e816a250c4108826aa397ec473689c318d7cef65103a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ru/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ru/firefox-118.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "554ab054c041c279a62ce29a84ca030ec7e2b19b8db7bc61e5f3e2b2dd5118bf"; + sha256 = "b8b8abb2f3f7debfec4a317827670ad60f8b58e6392d18c9287b0b8c240ec30a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sc/firefox-118.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "a60581fac2fe16b2692a2e5ad5b625a93690c46ece6e25902193c3c7f5741b5a"; + sha256 = "866942f7ad8d315f46ca957a3368c817ee24350e80552d50495541fff095644b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sco/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sco/firefox-118.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "63312e044a3b619552a8fcb901952a905d7740c2622234d63802fc90111a7ade"; + sha256 = "c2283df0f32c9a827411f0f169620e5c1881c284c2fc0e53a216e7703e1d25d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/si/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/si/firefox-118.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "92d17e48142740d7d5e7e7ede07ad36ddeb82033a716e6532a54b4456a8e84a1"; + sha256 = "d6e0fdcaebae693223519b61a2c24b1004172d8acef620c8ba1dc12c23e46829"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sk/firefox-118.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e58b27edd6d1e92bdd3dcc4118e66e7ebd60c716b82e527796a4debfd07888f4"; + sha256 = "196b35bee7e52a730a6dd3fb7d930b3129bfd5ec1aab8829c26eb7940ecff08c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sl/firefox-118.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ac0642523b0603114faf56fde13dc2ffba9c80e781c7003ef65bf95f6d19fa8b"; + sha256 = "757b22c9f72872e31a6c0d004b292c64143332177e1567c02bb79311551e07f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/son/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/son/firefox-118.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "bf1260296304692ed7cc09e8bf6aea61de8c3de7c01ca14d9a7ed98fed64d43d"; + sha256 = "17bee8e8190f619a2902d2319e8a09ef627b1aac379e0a21db762cf5e4e5d3ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sq/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sq/firefox-118.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2379151ddaa60f60864834724be03b8893482979c2a9c627e48502e0d6a7c00b"; + sha256 = "ff92757ffa30a984ac8304a012d171694d36459fc5e9212957ff305609cc31f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sr/firefox-118.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7e49e729e5bda8973d1e59c486f435bd4a65b37800210e2f99c09fbe40632deb"; + sha256 = "0c109f92207ca4958e988f7993f7a897938bdb9b901c2f86ade8d66bbec5fa14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sv-SE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/sv-SE/firefox-118.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "94530cf755bf8e53354e687d57bd7ccd67a4c39b2985a75e6d8756b8e9fe2ee0"; + sha256 = "6dbe6688153270bcffd5b4dd55395a61009f6e1a4728c10c74ec46cc0378a168"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/szl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/szl/firefox-118.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3cf2cf3a9dfc868c830d278c54a0d4634ee1ad3d7f2727a50a9fef3e4786309f"; + sha256 = "22b9815aec5e559b25084883f11f8016446e7565f8f934fec41e5b7e54849fbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ta/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ta/firefox-118.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "659f85d4e72aa14609e82a37df1048eb039ffb2ff5613273eed7a9b66ae29871"; + sha256 = "9698a3784df768b5de25dedd0478441d38e54809bba629b59b69c6e17e6c2a36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/te/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/te/firefox-118.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e9f6025eefbb54340ef73849de76acb838bd31594667d53991fec1fe6a6052f9"; + sha256 = "4fa339cbec66824f8fdff0208159b21fc10c5136aa4640ff0ebcd1bd96225af5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/tg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/tg/firefox-118.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "9862028cad77ad49e30da59c5a436205466a86aefa3e10c685153394ffc48fc1"; + sha256 = "838ed9bc5ca4d471a1a9fe58773ec45f14f41dc3c1ba83ff647458dd5c1f15bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/th/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/th/firefox-118.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e0aedabb6452b8ab296b4c7ec4e8328108bdd73fd7dd2f34a3ba2febcccb6ff2"; + sha256 = "e34d33ce6b8e54dbfb36760a45ef04c93362d8d40c13462919287d28377c9eb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/tl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/tl/firefox-118.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e4abf5b13f05d3d6f5373fe178cdf53bc420a277549d5ab8d920ba541474ef1d"; + sha256 = "687decddaaa0ca79841270bfe1f1140aa6d5462e54b350ec12d3d26d7f3ec00e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/tr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/tr/firefox-118.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "80833c233a29bc6064b05f6ae0dd3484814ce8eac9af5b49e19313d47c965454"; + sha256 = "1b86cd2ac1975b54b6d6892d76535220f43b26c41408cc12c41d7a96b7b12830"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/trs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/trs/firefox-118.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8f71e5b5660e5fc70728fb4c14d3bd4626c5198964eadd5866604367c444c183"; + sha256 = "ebb57897cee0b26dc79ed49328f4c5b1bf5263ee1ba1bd6b35c1c1567e2ec144"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/uk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/uk/firefox-118.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "1f4b2710661432b2dcc40b9489c4609f1e6b60147d09e221e74558e2fa595c1f"; + sha256 = "c39233edefd27fcc047c39120f750755eedc87ad41216009ae48189614e36c3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/ur/firefox-118.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a6810d749716efe089b5ae67e52ff51e4368213648e64716b91da7806ac60e0c"; + sha256 = "107f562b8e96e2991f1cbc6d504d3cd6daa5a6bbe22eca3a8348efc92a258b52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/uz/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/uz/firefox-118.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b02d490c4ad4d3c9148ab9fe9cc28b6484d540832a7850ff049d1f2748bf0d3d"; + sha256 = "7901cc8b3c9982afbb2f4460907e3eba8cf169a057f11ff8cbda4f7557711edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/vi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/vi/firefox-118.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "65a7e90b36fa8b96972869c6e83c911cebb20b9de9ac91dadbe9048b0e5e8d5a"; + sha256 = "25cbb511c3382c80e94f828108c40f6ed8f29a09b43abdbe3bf105137d451351"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/xh/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/xh/firefox-118.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ab05ae65b098462761b67409fbcb92cb1c480defc70b9771fe6de0be3ea0a2e5"; + sha256 = "d20f6a18f0b16fc6006699af1416401ebe160693b10706fd94f5e7c6c1aea791"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/zh-CN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/zh-CN/firefox-118.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7fc5a43500f9b190937f72f3d0203489a43b805762c02d48ac0844975f03cabb"; + sha256 = "6106adc2b568c9914aa3d7255e16fb5800d904afa9873f5067bd93ad19007afe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/zh-TW/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0/linux-i686/zh-TW/firefox-118.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1a4c43ff0c176ede40b17275d2a5eea49e58711d228d1a34c3a15695786e23c1"; + sha256 = "a049a24ac7f8cd720c4008a8ff2a2a25a67c02bbd85862918000dd6bf16a91f1"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2d05c4699348..58c65385b7e5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "117.0.1"; + version = "118.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071"; + sha512 = "7c34c43930bda84d17a241fe7e0f8e6ca262410423ae7e7cc8444224aea2d25a52acc9079064ba57f3350e3573eb23aeaf7a2d98136d17e6fa89a61aaf57155d"; }; meta = { @@ -90,11 +90,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.2.1esr"; + version = "115.3.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5f9ff96996e3c482fa4d2e2861fdf14d2154bf0277d412bf9c9435204c7e2e2539ce7ef0891d8dafc74d5a12650a5ccd33d79547aa1bbb2c2a0972aaeb755edf"; + sha512 = "4a85095620a61dc516cfce6f288ba491a99c72a78c6dfae264c1292f9eba902e3df7101b97a6f8531114ccce421c92586e143872798aafd7aabbe98a257692ee"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e909b15f77ae..12924180c25c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -362,7 +362,7 @@ let extraPoliciesFiles=(${builtins.toString extraPoliciesFiles}) for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do - jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json + jq -s '.[0] * .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json mv .tmp.json "$POL_PATH" done diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index baa76488f661..f6689f6ae87d 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -29,9 +29,9 @@ rec { sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure ''; - extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ]; + extraPrefsFiles = [ "${src.settings}/librewolf.cfg" ]; - extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; + extraPoliciesFiles = [ "${src.settings}/distribution/policies.json" ]; extraPassthru = { librewolf = { inherit src extraPatches; }; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index c9ecd3de9219..c5c2be0dc8ef 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,15 @@ { - "packageVersion": "116.0.3-1", + "packageVersion": "117.0.1-1", "source": { - "rev": "116.0.3-1", - "sha256": "19l5nny96p89xm8c9f5m1435sglshn7izmjnj338c8qh217zxiyq" + "rev": "117.0.1-1", + "sha256": "06j85b6v54vxj99hgrlibpsg6f8w8cqj912vz7gwyfa17pawax9z" + }, + "settings": { + "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", + "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" }, "firefox": { - "version": "116.0.3", - "sha512": "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9" + "version": "117.0.1", + "sha512": "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071" } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index a2100ac2ab8b..25a6e46d2277 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitLab }: +{ lib, fetchurl, fetchFromGitLab, fetchFromGitea }: let src = lib.importJSON ./src.json; in { @@ -9,6 +9,12 @@ in fetchSubmodules = true; inherit (src.source) rev sha256; }; + settings = fetchFromGitea { + domain = "codeberg.org"; + owner = "librewolf"; + repo = "settings"; + inherit (src.settings) rev sha256; + }; firefox = fetchurl { url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index b8bc64afafe0..2cd36786c755 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -57,9 +57,18 @@ writeScript "update-librewolf" '' ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) echo "ffHash=$ffHash" + # upstream does not specify settings rev, so just get the latest. see https://github.com/NixOS/nixpkgs/issues/252276 + settingsRev=$(curl 'https://codeberg.org/api/v1/repos/librewolf/settings/commits?sha=master&limit=1' | jq -r .[0].sha) + echo "settingsRev=$settingsRev" + repoUrl=https://codeberg.org/librewolf/settings + nix-prefetch-git $repoUrl --quiet --rev $settingsRev > $prefetchOut + settingsSha256=$(jq -r .sha256 < $prefetchOut) + jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson + jq ".settings.rev = \"$settingsRev\"" $srcJson | sponge $srcJson + jq ".settings.sha256 = \"$settingsSha256\"" $srcJson | sponge $srcJson '' diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 5b619bd6452c..77f948b2d755 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,7 +78,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5.4"; + version = "12.5.5"; sources = { x86_64-linux = fetchurl { @@ -86,7 +86,7 @@ let "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" ]; - hash = "sha256-xjCsCg6XsnXAiNw6frgJVZRV9UBZA2EAcuHa2Bjq/ro="; + hash = "sha256-ISmhKitFReHSADGygzpoKwlBOJH2HfPDEtMjTB6fMhs="; }; }; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index ece75ad87257..a97d2b6ee81a 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -17,19 +17,19 @@ , palemoon-bin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.3.1"; + version = "32.4.0.1"; src = fetchzip { urls = [ - "https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" - "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII=" + "sha256-kGt3pIgCjVeSD6UXRvj5w9opWrMx3q3B/Y0S55kKS08=" else - "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY="; + "sha256-kNvUC/ir7TKjvKXYFoEDOPAY75CEgeixmEV1tuB/WIM="; }; preferLocalBuild = true; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; desktopItems = [(makeDesktopItem rec { - name = pname; + name = "palemoon-bin"; desktopName = "Pale Moon Web Browser"; comment = "Browse the World Wide Web"; keywords = [ @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on efficiency and customization. + Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected @@ -186,4 +187,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; hydraPlatforms = []; }; -} +}) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 64f0a431ea24..e2d89b8f6955 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null) fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5.4"; + version = "12.5.5"; lang = "ALL"; @@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-AIwqIz8QG7Fq3Vvd22QTNFH1fnZgtH25qUaECX50QCQ="; + hash = "sha256-FS1ywm/UJDZiSYPf0WHikoX/o6WGIP+lQQGFeD0g2dc="; }; i686-linux = fetchurl { @@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-s8UReyurIKlxG0bT0ecGUcXMTTHyYKy/AcygTE6ujqo="; + hash = "sha256-6ozGIQPC8QnZxS1oJ0ZEdZDMY2JkwRHs+7ZHUkqrL6U="; }; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 22a993a017eb..da65c169732c 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-GpPgjRqzH4fcnaHs9SWfdaCZimwBleXnxQLjqy8SArs="; + hash = "sha256-zytorArHhdwF7F9c2QkaX3KxLNlWySKieK2K1b5omFI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index df8380010bbd..8259a574cc1c 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.7.0"; + version = "2.7.7"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-co4LVd5A0bJ4CIuCfv6WyV8XCMbPCFAAcV12WekYrw4="; + hash = "sha256-HgLV4iuZXkL6BOKtUul1pFuIWv09VnUSPbdrtFd6Khk="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-oclMnt6uJa8SG2fNM0fi+HCVMMi4rkykx8VpK/tXilQ="; + vendorHash = "sha256-mXLZMnGJ1m5gFroJcSoE4SbVvsyuS73hfXFeWBRtUdI="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 3d948dd89fb0..1d0356e68ebb 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-CEalMrXdLa/pGok1uB60PmxYmmDnSas38cUxvOpkoGk="; + hash = "sha256-RoodFtZ4BINyPxxpVkliMD9Sam0eRujvd3gXR2Hxk70="; }; - vendorHash = "sha256-JDhpRXYnNhVJ5BBKdUmCponRpckH54gMRoKLQ+wx5zM="; + vendorHash = "sha256-PIuSn4qp6bLPFJwkLEb+pX1ra49IkxXYDRzEFbVqVI0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock new file mode 100644 index 000000000000..c7e42c551fe7 --- /dev/null +++ b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock @@ -0,0 +1,2044 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfdyndns" +version = "0.2.0" +dependencies = [ + "anyhow", + "clap", + "clap-verbosity-flag", + "cloudflare", + "log", + "pretty_env_logger", + "public-ip", + "tokio", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets", +] + +[[package]] +name = "clap" +version = "4.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap-verbosity-flag" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +dependencies = [ + "clap", + "log", +] + +[[package]] +name = "clap_builder" +version = "4.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.10.0", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "cloudflare" +version = "0.10.1" +source = "git+https://github.com/jcgruenhage/cloudflare-rs.git?branch=make-owner-fields-optional#02397fc4211886548a31a0731b240f2e17309de4" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.13.1", + "cfg-if", + "chrono", + "http", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_qs", + "serde_with", + "url", + "uuid", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core 0.10.2", + "darling_macro 0.10.2", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.9.3", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.37", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core 0.10.2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" +dependencies = [ + "darling 0.10.2", + "derive_builder_core", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" +dependencies = [ + "darling 0.10.2", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dns-lookup" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" +dependencies = [ + "cfg-if", + "libc", + "socket2 0.4.9", + "winapi", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-openssl" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" +dependencies = [ + "http", + "hyper", + "linked_hash_set", + "once_cell", + "openssl", + "openssl-sys", + "parking_lot", + "tokio", + "tokio-openssl", + "tower-layer", +] + +[[package]] +name = "hyper-system-resolver" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eea26c5d0b6ab9d72219f65000af310f042a740926f7b2fa3553e774036e2e7" +dependencies = [ + "derive_builder", + "dns-lookup", + "hyper", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.148" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl" +version = "0.10.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "proc-macro2" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "public-ip" +version = "0.2.2" +source = "git+https://github.com/jcgruenhage/rust-public-ip.git?branch=cloudflare-provider#f0f0e68aebf9d796deaa3af04c8c6d4df3c515fe" +dependencies = [ + "dns-lookup", + "futures-core", + "futures-util", + "http", + "hyper", + "hyper-openssl", + "hyper-system-resolver", + "openssl", + "pin-project-lite", + "thiserror", + "tokio", + "tower-layer", + "tracing", + "tracing-futures", + "trust-dns-client", + "trust-dns-proto", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "reqwest" +version = "0.11.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +dependencies = [ + "base64 0.21.4", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.38.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "time" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +dependencies = [ + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.4", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-openssl" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +dependencies = [ + "futures-util", + "openssl", + "openssl-sys", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "futures", + "futures-task", + "pin-project", + "tracing", +] + +[[package]] +name = "trust-dns-client" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" +dependencies = [ + "cfg-if", + "data-encoding", + "futures-channel", + "futures-util", + "lazy_static", + "radix_trie", + "rand", + "thiserror", + "time", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.37", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index af52ed7b64ba..3d348d347172 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -2,24 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "cfdyndns"; - version = "0.0.4"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "colemickens"; + owner = "nrdxp"; repo = "cfdyndns"; rev = "v${version}"; - hash = "sha256-kgpTKhMvxuy+Q9M5U/PKJt7pZ2kSQxkCNjNu8aIyutg="; + hash = "sha256-iwKMTWLK7pgz8AEmPVBO1bTWrXTokQJ+Z1U4CiiRdho="; }; - cargoHash = "sha256-78TQkRHEbSaCyCM48hH1h8GG0BGJmC2zc7gTZc2t9Nc="; + cargoLock.lockFile = ./Cargo.lock; + cargoLock.outputHashes."cloudflare-0.10.1" = "sha256-AJW4AQ34EDhxf7zMhFY2rqq5n4IaSVWJAYi+7jXEUVo="; + cargoLock.outputHashes."public-ip-0.2.2" = "sha256-DDdh90EAo3Ppsym4AntczFuiAQo4/QQ9TEPJjMB1XzY="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { description = "CloudFlare Dynamic DNS Client"; - homepage = "https://github.com/colemickens/cfdyndns"; + homepage = "https://github.com/nrdxp/cfdyndns"; license = lib.licenses.mit; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens nrdxp ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index 4194f4c22887..104f39f4460b 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -43,6 +43,5 @@ in meta = metaCommon // { platforms = [ "x86_64-linux" ]; - mainProgram = "caprine"; }; }) diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix index 3dc457c48826..6a53bba026c5 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix @@ -30,6 +30,5 @@ stdenvNoCC.mkDerivation { meta = metaCommon // { platforms = with lib.platforms; darwin; - mainProgram = "caprine"; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index 501d8f7d163f..ed8fab4473c0 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.58.0"; + version = "2.58.3"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; + sha256 = "sha256-w0nBQhHYzFLsNu0MxWhoju6fh4JpAKC7MWWVxwDkRYk="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; + sha256 = "sha256-6Mx2ZkT2hdnaSVt2hKMMV9xc7rYPFFbxcj6vb84ojYU="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index abac3efd0a7f..da048973c0f6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -6,47 +6,47 @@ let canary = "0.0.167"; development = "0.0.232"; } else { - stable = "0.0.273"; - ptb = "0.0.59"; - canary = "0.0.283"; - development = "0.0.8778"; + stable = "0.0.278"; + ptb = "0.0.77"; + canary = "0.0.312"; + development = "0.0.8795"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-eCfF7zC9JM/y14ovSJxMIvLY+IGv0Jvzn7MVgueltNs="; + hash = "sha256-eCfF7zC9JM/y14ovSJxMIvLY+IGv0Jvzn7MVgueltNs="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "omPqp8iyQpp5UxoOlp0+iaQG6yuKVVGaYhl7I643dqQ="; + hash = "sha256-omPqp8iyQpp5UxoOlp0+iaQG6yuKVVGaYhl7I643dqQ="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-ua99w5pJz8UZldMvYLB7SkcgAG2hQBdorbnugvFDktE="; + hash = "sha256-ua99w5pJz8UZldMvYLB7SkcgAG2hQBdorbnugvFDktE="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - sha256 = "sha256-AsHdQvDLzflhuYO8V4R+2zjQYpRo+aPa8HYXc3taayY="; + hash = "sha256-AsHdQvDLzflhuYO8V4R+2zjQYpRo+aPa8HYXc3taayY="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - sha256 = "1vz2g83gz9ks9mxwx7gl7kys2xaw8ksnywwadrpsbj999fzlyyal"; + hash = "sha256-c60p8RX5Rv8tx6io65XbqyzJJKaCVDeL5NtwMLNIX5M="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; + hash = "sha256-Dn+k51SyHpJ1C1gJx3ZLRzD/cdzhX9qANZU2KEn9lY0="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; + hash = "sha256-iV131kzFcN2+eqUetqZShKqjAQfm64y6bxzAddV7wuw="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc="; + hash = "sha256-d/i7LHbJbbUUk/7iU63Xh4RWxs8ZyiCpZSS68JFW2Ps="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index a9ce755be58a..54a2e9e6c017 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -23,16 +23,16 @@ }: let - version = "3.1.2-13107"; - _hash = "ad5b5393"; + version = "3.2.1-17153"; + _hash = "b69de82d"; srcs = { x86_64-linux = fetchurl { url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb"; - hash = "sha256-mBfeexWEYpGybFFianUFvlzMv0HoFR4EeFcwlGVXIRA="; + hash = "sha256-+GjTjv0K2vnlkb46KhMvRRFWuIEBz23Lg3QhiA7QzkA="; }; aarch64-linux = fetchurl { url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb"; - hash = "sha256-V6kR2lb63nnNIEhn64Yg0BYYlz7W0Cw60TwnKaJuLgs="; + hash = "sha256-BtmmVpKZF15aU7RRmXl9g5leg2jz5sT4vYXluq9aIYk="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 6bee6f1476a2..c4fdf9352046 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.7"; + version = "3.9.8"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-DxY8cXWHBboH6Uh2i9DSJ2F8/OaGTRlIEaLzhQpXnKk="; + hash = "sha256-sx4WRAeitbBrz6jFvD0WF/EzR7cx4tOPoczbJ+tkw1s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 007bf5542e28..8a5514f4df96 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230922-4"; + version = "20230926"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-6VzcylvGyEB+5KYX1r9wEEfSECh+O947KdcN3DMJxE0="; + hash = "sha256-OU5jKalS8vbQPMT+/FgXbRjWrgL96oIp2I/eHsRa7Q8="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index 688fe579f877..2981a26a8e3e 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -6,12 +6,6 @@ set -eou pipefail latest_linux_version=$(curl -L --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') latest_mac_version=$(curl -L --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') -# Double check that the latest mac and linux versions are in sync. -if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then - echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same" - exit 1 -fi - nixpkgs="$(git rev-parse --show-toplevel)" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 5fa07ea7a923..e4dc6bc49100 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.8"; + version = "1.3.11"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-G0UBzSXoZPLHBsM0nslPLNBZs0sUAQYJ403nPV+3Qu4="; + hash = "sha256-xSNjAao8pv3jGRK68bkwGy0vo3nm8KRZjTtCEge4kHs="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 540555b412ab..a0c7b678d5a0 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; - hash = "sha256-j4sgZ+tJpV6ST0yLmbLTLgBxQTcK1LZoEEfMe3TUAC4="; + hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI="; }; # grab the plugin sdk for the desktop icon diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 3464098d9749..ce9476807465 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -86,9 +86,6 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - postBuild = '' make doc-man ''; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 15e7304ef9b9..4522ad35ecab 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.10.2"; + version = "2.11.1"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3ZsRJNGbcKGU6v2uYUintMpKY8Z/DyTIDDxTsDEV6lw="; + hash = "sha256-J3eRuQK53Tsh1vhIgEUYBv08c6v3fSMzgK2PIhA13Qw="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index bb9bb957f3d3..038d904f453b 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -42,7 +42,6 @@ mkDerivation rec { }; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 701b266b7309..b9b8ee29b180 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-x97I0TDPAd/zULM/FpAvYQTcArG2CwGoUUp/eEM4vdc="; + sha256 = "sha256-buInsfjzpY4EF7bSojy42YNXssbNriSQGYBFE/DUJ7A="; }; postPatch = '' diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index 5eb262168892..d4e6d7a393f2 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/pkgs/applications/networking/soju/default.nix @@ -18,13 +18,6 @@ buildGoModule rec { vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4="; - subPackages = [ - "cmd/soju" - "cmd/sojuctl" - "contrib/migrate-db" - "contrib/znc-import" - ]; - nativeBuildInputs = [ installShellFiles scdoc @@ -33,17 +26,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; postBuild = '' - make doc/soju.1 + make doc/soju.1 doc/sojuctl.1 ''; postInstall = '' - installManPage doc/soju.1 + installManPage doc/soju.1 doc/sojuctl.1 ''; preCheck = '' - # Test all targets. - unset subPackages - # Disable a test that requires an additional service. rm database/postgres_test.go ''; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 11d291238727..e99c0fedf961 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.1"; + version = "0.3.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - hash = "sha256-jIekGA+MG9tvjEyHAI3dcD7lI1JL/qPqRpVO9gRhcTw="; + hash = "sha256-UmBXAfRIr9zOScqibKPHeKzr+UTx3gbGEm0tl7qn+oE="; stripRoot = false; }; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index c16c757836aa..1e5852b8cc83 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.13.2"; + version = "7.14.3"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-HwRJUrNaoAnNuIcDWgXOYA+PxLjOE6NXRJqINIbVxOw="; + sha256 = "sha256-wW72T1+RfejaI9LxSxa/g0lvIRmAeFa2ZaEa8K9mRcw="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 7e0c01c2f5f7..ee03d67d5986 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation (finalAttrs: { python.pkgs.numpy ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optionals usePython [ + cmakeFlags = lib.optionals usePython [ "-DUSE_PYTHON_CONFIG=ON" ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e2e1cda4c259..d656c39d0bc0 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - hash = "sha256-8Iheb/9wjf0u10ZQRkLMLNN2s7P++Fqcr26iatiKcTo="; + hash = "sha256-bYvGmYu9jMHk2IUICz2kCVh56Ymz8JHqurdWV+xEdJY="; }; patches = [ @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://stellarium.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kilianar ]; }; } diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 6884e1955f75..a529867aaa74 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib rocksdb rapidjson ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DPORTABLE=off" "-DRAPIDJSON_HOME=${rapidjson}" "-DROCKSDB_HOME=${rocksdb}" diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index fa9b77037038..3403e410cf85 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { "-DKICAD_BUILD_QA_TESTS=OFF" ] ++ optionals (debug) [ - "-DCMAKE_BUILD_TYPE=Debug" "-DKICAD_STDLIB_DEBUG=ON" "-DKICAD_USE_VALGRIND=ON" ] @@ -115,6 +114,8 @@ stdenv.mkDerivation rec { "-DKICAD_SANITIZE_THREADS=ON" ]; + cmakeBuildType = if debug then "Debug" else "Release"; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 715a99cf4897..a750001d05db 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DGLAD_REPRODUCIBLE=On" ]; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 3cb06c4e7b14..693be7f33886 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; + hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s="; }; duneVersion = "3"; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index e9f04d2044dc..1513c7477985 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs ./src/ ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Production" - ]; + + cmakeBuildType = "Production"; meta = with lib; { description = "A high-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index b8a05074aaa1..7c483ec185c7 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { patchShebangs ./src/ ''; + cmakeBuildType = "Production"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Production" "-DBUILD_SHARED_LIBS=1" "-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar" ]; diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 401b2f48a6ea..68f68355f816 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -72,10 +72,11 @@ in stdenv.mkDerivation rec { (lit.override { python = kleePython; }) ]; + cmakeBuildType = if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"; + cmakeFlags = let onOff = val: if val then "ON" else "OFF"; in [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"}" "-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}" "-DLLVMCC=${clang}/bin/clang" "-DLLVMCXX=${clang}/bin/clang++" diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 7509ca63c804..12465ad9087f 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-3Ni+NiD0iSsOruUyRpBd+aC0TZNYfOLhwqCpPHPruPg="; + hash = "sha256-6qbCafG0bL5KxQt2gL6hV4PFDsEMM0UXfldeOOqxsaE="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index c1acd79dcab0..c611ccdf5b01 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; - version = "1.73"; + version = "1.74"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-VmRn51UrJTGEG4n2fi5kRv8khXakfGbqMtYPejsZCBI="; + hash = "sha256-DiwLo/3RcXY+wG2+7aDx4p6UuQm/eNX/kG35TJzIbe0="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 16110a69bb41..0a2c036d3909 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.147"; + version = "5.12.149"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-TaYuxyezegPZPWlkYcZk+YhmHqQ/P1nO5D5JC3LN8bo="; + hash = "sha256-8e7tuNXgYT4wkTbxEz+Sqp0zVody0QC+yK8gcjR3Pww="; }; - cargoHash = "sha256-9oqw2rIAhdo5G2GsW7rwHMymgFASKE7OrVqO2ewfG2g="; + cargoHash = "sha256-V5c/UsNFWogCgyHSDwsOm2Nfsl/vBUClKQGmwzYqNz0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 8fd20cc8f9fb..0c20b51fbc55 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-iM5a0uy+egPBMSDBo6ks8QNfRoKku2GmFpzoanSDm9M="; + hash = "sha256-qNLVbhVXITbMRI2x/0q5enJgjL3EAcXBwqWeH6MPfZs="; }; - cargoHash = "sha256-bpPrnguDSj1K22vmf/hEimd4tVS6ANmTiVtdsUuN1BM="; + cargoHash = "sha256-UrzJGEASGaDqKUrPiNcjldevCqCPaNXJXNYecbHodOc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix index a7288aa24e6e..3aca6673589c 100644 --- a/pkgs/applications/version-management/subgit/default.nix +++ b/pkgs/applications/version-management/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.16"; + version = "3.3.17"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA="; + sha256 = "sha256-u8YhaF4zOlDpEYd/0VUN8k4X8E1G4PB+UkJjBfQKkJY="; }; } diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 823dbfef97a9..f1c2b13d73a2 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-Fdj7i4jpKIDwaIBAch7SjIV/WnqMDnCfNYSiZLsamx8="; + sha256 = "sha256-mCDw8V/Uzewm32rj+mkkm5atS5nJAFJ3ry1boTn+gqI="; }; sourceRoot = "source/src"; diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index 9e3875453305..71d8ef75e213 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.12.0-1"; + version = "1.12.0-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-WSnHyO71VIZDXYTcTCXcXZUkw5ScbIscs9daQokj3kA="; + hash = "sha256-LnTRznIUXU7h0SyOCfVjfqhNv2OCRujNoM1PtGUVJeU="; }; unpackPhase = '' diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index a1eb4086e89c..43bd337ae500 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { '' ; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DENABLE_DEPLOY_DEPENDENCIES=OFF" "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" "-DUSE_SYSTEM_PROTO_LIBS=ON" diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index c36478d3885b..b94acdecc54f 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-hi3ppYDzFEp4FGZHlGgwEFqyOqzX+d0JK674EyibB/c="; + hash = "sha256-H8+KJ9+HLAorGIeljw8H3N8W3E2yYhAno1xy+jI54zM="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 5c26d20eda98..47afaef81a63 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -72,7 +72,6 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DQTROOT=${qtbase}" "-GNinja" ] ++ lib.optionals (!withDbus) [ diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 34b6eb9c2862..6a686d9d2c2a 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -34,7 +34,9 @@ in mkDerivation rec { ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + cmakeBuildType = "RelWithDebInfo"; + + cmakeFlags = [ "-DQTROOT=${qtbase}" ]; # plexmediaplayer currently segfaults under wayland qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ]; diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 152bb056bc55..ddb06a97f162 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,8 +1,9 @@ { lib , fetchFromGitHub -, makeRustPlatform , hostPlatform , targetPlatform +, cargo +, rustc , lld }: @@ -24,7 +25,12 @@ let }; }; - inherit (cross) rustPlatform; + # inherit (cross) rustPlatform; + # ^ breaks because we are doing a no_std embedded build with a custom sysroot, + # but the fast_cross rustc wrapper already passes a sysroot argument + rustPlatform = cross.makeRustPlatform { + inherit rustc cargo; + }; in diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index b9fbc191d9c1..75641547ad2e 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "stratovirt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-K99CmaBrJu30/12FxnsNsDKsTyX4f2uQSO7cwHsPuDw="; + sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw="; }; patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; - cargoSha256 = "sha256-SFIOGGRzGkVWHIXkviVWuhDN29pa0uD3GqKh+G421xI="; + cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch index 6aa0da30c44a..11d2a0e88e19 100644 --- a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch +++ b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch @@ -1,4 +1,4 @@ -From af3001b1b2697ae3165e2fdf47a560fd9ab19a68 Mon Sep 17 00:00:00 2001 +From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001 From: Astro <astro@spaceboyz.net> Date: Sun, 18 Jun 2023 23:10:23 +0200 Subject: [PATCH] micro_vm: allow SYS_clock_gettime @@ -8,13 +8,13 @@ Subject: [PATCH] micro_vm: allow SYS_clock_gettime 1 file changed, 2 insertions(+) diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs -index 89ce5c29..2a6aa0cc 100644 +index c37d3f4e..f9e7cce2 100644 --- a/machine/src/micro_vm/syscall.rs +++ b/machine/src/micro_vm/syscall.rs -@@ -128,6 +128,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { - #[cfg(all(target_env = "gnu", target_arch = "x86_64"))] +@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { BpfRule::new(libc::SYS_readlink), BpfRule::new(libc::SYS_getrandom), + BpfRule::new(libc::SYS_fallocate), + #[cfg(target_env = "gnu")] + BpfRule::new(libc::SYS_clock_gettime), madvise_rule(), diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix deleted file mode 100644 index e344bbdf558d..000000000000 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, libtiff -, fltk, gtk -, libICE, libSM -, dbus -, fetchpatch -}: - -stdenv.mkDerivation rec { - - pname = "afterstep"; - version = "2.2.12"; - sourceName = "AfterStep-${version}"; - - src = fetchurl { - urls = [ "ftp://ftp.afterstep.org/stable/${sourceName}.tar.bz2" ]; - sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; - }; - - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; - sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4"; - }) - - # Fix pending upstream inclusion for binutils-2.36 support: - # https://github.com/afterstep/afterstep/pull/7 - (fetchpatch { - name = "binutils-2.36.patch"; - url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch"; - sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8"; - }) - ]; - - postPatch = '' - # Causes fatal ldconfig cache generation attempt on non-NixOS Linux - for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do - substituteInPlace $mkfile \ - --replace 'test -w /etc' 'false' - done - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libtiff fltk gtk libICE libSM dbus ]; - - # A strange type of bug: dbus is not immediately found by pkg-config - preConfigure = '' - # binutils 2.37 fix - # https://github.com/afterstep/afterstep/issues/2 - fixupList=( - "autoconf/Makefile.defines.in" - "libAfterImage/aftershow/Makefile.in" - "libAfterImage/apps/Makefile.in" - "libAfterBase/Makefile.in" - "libAfterImage/Makefile.in" - ) - for toFix in "''${fixupList[@]}"; do - substituteInPlace "$toFix" --replace "clq" "cq" - done - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" - ''; - - # Parallel build fails due to missing dependencies between private libraries: - # ld: cannot find ../libAfterConf/libAfterConf.a: No such file or directory - # Let's disable parallel builds until it's fixed upstream: - # https://github.com/afterstep/afterstep/issues/8 - enableParallelBuilding = false; - - meta = with lib; { - description = "A NEXTStep-inspired window manager"; - longDescription = '' - AfterStep is a window manager for the Unix X Window - System. Originally based on the look and feel of the NeXTStep - interface, it provides end users with a consistent, clean, and - elegant desktop. The goal of AfterStep development is to provide - for flexibility of desktop configuration, improving aestetics, - and efficient use of system resources. - ''; - homepage = "http://www.afterstep.org/"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix deleted file mode 100644 index e044ce8485e5..000000000000 --- a/pkgs/applications/window-managers/berry/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, copyDesktopItems -, fontconfig -, freetype -, libX11 -, libXext -, libXft -, libXinerama -, makeDesktopItem -, pkg-config -, which -}: - -stdenv.mkDerivation rec { - pname = "berry"; - version = "0.1.12"; - - src = fetchFromGitHub { - owner = "JLErvin"; - repo = pname; - rev = version; - hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk="; - }; - - nativeBuildInputs = [ - copyDesktopItems - pkg-config - which - ]; - - buildInputs =[ - libX11 - libXext - libXft - libXinerama - fontconfig - freetype - ]; - - postPatch = '' - sed -i --regexp-extended 's/(pkg_verstr=").*(")/\1${version}\2/' configure - ''; - - preConfigure = '' - patchShebangs configure - ''; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "berry"; - comment = meta.description; - desktopName = "Berry Window Manager"; - genericName = "Berry Window Manager"; - categories = [ "Utility" ]; - }) - ]; - - meta = with lib; { - homepage = "https://berrywm.org/"; - description = "A healthy, bite-sized window manager"; - longDescription = '' - berry is a healthy, bite-sized window manager written in C for unix - systems. Its main features include: - - - Controlled via a powerful command-line client, allowing users to control - windows via a hotkey daemon such as sxhkd or expand functionality via - shell scripts. - - Small, hackable source code. - - Extensible themeing options with double borders, title bars, and window - text. - - Intuitively place new windows in unoccupied spaces. - - Virtual desktops. - ''; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 73db7f0353fc..17f53883424c 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-k+rG5AZjz47Q6bpVcTK7r4s7Avg3O+1iw+skK+cn0rk="; }; - cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + cmakeBuildType = if debug then "Debug" else "Release"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix deleted file mode 100644 index d4ae41134ebc..000000000000 --- a/pkgs/applications/window-managers/notion/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, lua, gettext, which, groff, xmessage, xterm -, readline, fontconfig, libX11, libXext, libSM -, libXinerama, libXrandr, libXft -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "notion"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "raboof"; - repo = pname; - rev = version; - sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; - }; - - # error: 'PATH_MAX' undeclared - postPatch = '' - sed 1i'#include <linux/limits.h>' -i mod_notionflux/notionflux/notionflux.c - ''; - - nativeBuildInputs = [ pkg-config makeWrapper groff ]; - buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM - libXinerama libXrandr libXft ]; - - buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; - - makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ]; - - postInstall = '' - wrapProgram $out/bin/notion \ - --prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \ - ''; - - meta = with lib; { - description = "Tiling tabbed window manager"; - homepage = "https://notionwm.net"; - license = licenses.lgpl21; - maintainers = with maintainers; [ jfb AndersonTorres raboof ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix deleted file mode 100644 index dcd2bb27a71d..000000000000 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, awk -, grep -, sed -, runtimeShell -, cmake -, libXext -, libXft -, libXinerama -, libXpm -, libXrandr -, libjpeg -, libpng -, pkg-config -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pekwm"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "pekdon"; - repo = "pekwm"; - rev = "release-${finalAttrs.version}"; - hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - cmakeFlags = [ - "-DAWK=${awk}/bin/awk" - "-DGREP=${grep}/bin/grep" - "-DSED=${sed}/bin/sed" - "-DSH=${runtimeShell}" - ]; - - buildInputs = [ - libXext - libXft - libXinerama - libXpm - libXrandr - libjpeg - libpng - ]; - - meta = { - homepage = "https://www.pekwm.se/"; - description = "A lightweight window manager"; - longDescription = '' - pekwm is a window manager that once upon a time was based on the aewm++ - window manager, but it has evolved enough that it no longer resembles - aewm++ at all. It has a much expanded feature-set, including window - grouping (similar to ion, pwm, or fluxbox), autoproperties, xinerama, - keygrabber that supports keychains, and much more. - - - Lightweight and Unobtrusive, a window manager shouldn't be noticed. - - Very configurable, we all work and think in different ways. - - Automatic properties, for all the lazy people, make things appear as - they should when starting applications. - - Chainable Keygrabber, usability for everyone. - ''; - changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix deleted file mode 100644 index 472707bf35c0..000000000000 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake -, libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi -, libXrandr, fontconfig, freetype, readline -}: - -stdenv.mkDerivation rec { - pname = "ratpoison"; - version = "1.4.9"; - - src = fetchurl { - url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz"; - sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; - }; - - outputs = [ "out" "contrib" "man" "doc" "info" ]; - - configureFlags = [ - # >=1.4.9 requires this even with readline in inputs - "--enable-history" - ]; - - nativeBuildInputs = [ pkg-config autoconf automake ]; - - buildInputs = - [ perl - libX11 xorgproto libXt libXpm libXft libXtst libXi libXrandr - fontconfig freetype readline ]; - - postInstall = '' - mkdir -p $contrib/{bin,share} - mv $out/bin/rpws $contrib/bin - mv $out/share/ratpoison $contrib/share - ''; - - meta = with lib; { - homepage = "https://www.nongnu.org/ratpoison/"; - description = "Simple mouse-free tiling window manager"; - license = licenses.gpl2Plus; - - longDescription = '' - Ratpoison is a simple window manager with no fat library - dependencies, no fancy graphics, no window decorations, and no - rodent dependence. It is largely modelled after GNU Screen which - has done wonders in the virtual terminal market. - - The screen can be split into non-overlapping frames. All windows - are kept maximized inside their frames to take full advantage of - your precious screen real estate. - - All interaction with the window manager is done through keystrokes. - Ratpoison has a prefix map to minimize the key clobbering that - cripples Emacs and other quality pieces of software. - ''; - - platforms = platforms.unix; - maintainers = [ maintainers.AndersonTorres ]; - }; -} diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix deleted file mode 100644 index 9dd2a25e5cf3..000000000000 --- a/pkgs/applications/window-managers/smallwm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, doxygen, graphviz, libX11, libXrandr }: - -stdenv.mkDerivation rec { - - pname = "smallwm"; - version = "2020-02-28"; - - src = fetchFromGitHub { - owner = "adamnew123456"; - repo = "SmallWM"; - rev = "c2dc72afa87241bcf7e646630f4aae216ce78613"; - sha256 = "0cqhy81ymdcdyvgi55a401rr96h2akskcxi9ddzjbln4a71yjlz8"; - }; - - nativeBuildInputs = [ doxygen graphviz ]; - buildInputs = [ libX11 libXrandr ]; - - dontConfigure = true; - - makeFlags = [ "CC=${stdenv.cc}/bin/cc" "CXX=${stdenv.cc}/bin/c++" ]; - - buildFlags = [ "all" "doc" ]; - - installPhase = '' - install -dm755 $out/bin $out/share/doc/${pname}-${version} - install -m755 bin/smallwm -t $out/bin - cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version} - ''; - - meta = with lib;{ - description = "A small X window manager, extended from tinywm"; - homepage = "https://github.com/adamnew123456/SmallWM"; - license = licenses.bsd2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix deleted file mode 100644 index 903502db5015..000000000000 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, libX11 }: - -stdenv.mkDerivation rec { - pname = "tinywm"; - version = "2014-04-22"; - - src = fetchFromGitHub { - owner = "mackstann"; - repo = pname; - rev = "9d05612f41fdb8bc359f1fd9cc930bf16315abb1"; - sha256 = "1s7r4f2d3lk1i8h089v2vyrr02hh0y9i3ihl9kqgk9s87hqw8q5b"; - }; - - buildInputs = [ libX11 ]; - - dontConfigure = true; - - buildPhase = '' - $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm - ''; - - installPhase = '' - install -dm755 $out/bin $out/share/doc/${pname}-${version} - install -m755 tinywm -t $out/bin/ - # The annotated source code is a piece of documentation - install -m644 annotated.c README -t $out/share/doc/${pname}-${version} - ''; - - meta = with lib;{ - description = "A tiny window manager for X11"; - longDescription = '' - - TinyWM is a tiny window manager that I created as an exercise in - minimalism. It is also maybe helpful in learning some of the very basics - of creating a window manager. It is only around 50 lines of C. There is - also a Python version using python-xlib. - - It lets you do four basic things: - - - Move windows interactively with Alt+Button1 drag (left mouse button) - - Resize windows interactively with Alt+Button3 drag (right mouse button) - - Raise windows with Alt+F1 (not high on usability I know, but I needed a - keybinding in there somewhere) - - Focus windows with the mouse pointer (X does this on its own) - ''; - homepage = "http://incise.org/tinywm.html"; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = libX11.meta.platforms; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix deleted file mode 100644 index cf85b9ea06a8..000000000000 --- a/pkgs/applications/window-managers/waybox/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, meson -, cmake -, ninja -, libxkbcommon -, wayland -, wayland-scanner -, wayland-protocols -, wlroots -, pixman -, udev -, libGL -, libxml2 -, mesa -}: - -stdenv.mkDerivation rec { - pname = "waybox"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "wizbright"; - repo = pname; - rev = version; - hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; - }; - - nativeBuildInputs = [ - pkg-config - meson - cmake - ninja - wayland-scanner - ]; - - dontUseCmakeConfigure = true; - - buildInputs = [ - libxkbcommon - libxml2 - wayland - wayland-protocols - wlroots - pixman - udev - libGL - mesa # for libEGL - ]; - - passthru.providedSessions = [ "waybox" ]; - - meta = with lib; { - homepage = "https://github.com/wizbright/waybox"; - description = "An openbox clone on Wayland"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix deleted file mode 100644 index f1a6635b362a..000000000000 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchurl -, lesstif -, libX11, libXext, libXmu, libXinerama }: - -stdenv.mkDerivation rec { - - pname = "yeahwm"; - version = "0.3.5"; - - src = fetchurl { - url = "http://phrat.de/${pname}_${version}.tar.gz"; - sha256 = "01gfzjvb40n16m2ja4238nk08k4l203y6a61cydqvf68924fjb69"; - }; - - buildInputs = [ lesstif libX11 libXext libXinerama libXmu ]; - - dontConfigure = true; - - preBuild = '' - makeFlagsArray+=( CC="${stdenv.cc}/bin/cc" \ - XROOT="${libX11}" \ - INCLUDES="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXinerama.dev}/include -I${libXmu.dev}/include" \ - LDPATH="-L${libX11}/lib -L${libXext}/lib -L${libXinerama}/lib -L${libXmu}/lib" \ - prefix="${placeholder "out"}" ) - ''; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - postInstall = '' - gzip -9 --stdout yeahwm.1 > yeahwm.1.gz - install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ - ''; - - meta = with lib;{ - description = "An X window manager based on evilwm and aewm"; - longDescription = '' - YeahWM is a h* window manager for X based on evilwm and aewm. - - Features - - Sloppy Focus. - - BeOS-like tabbed titles, which can be repositioned. - - Support for Xinerama. - - Simple Appearance. - - Good keyboard control. - - Creative usage of the mouse. - - Respects aspect size hints. - - Solid resize and move operations. - - Virtual Desktops. - - "Magic" Screen edges for desktop switching. - - Snapping to other windows and screen borders when moving windows. - - Small binary size(ca. 23kb). - - Little resource usage. - - It's slick. - ''; - homepage = "http://phrat.de/index.html"; - license = licenses.isc; - maintainers = [ maintainers.AndersonTorres ]; - platforms = libX11.meta.platforms; - }; -} |