diff options
Diffstat (limited to 'pkgs/applications/editors')
49 files changed, 2058 insertions, 910 deletions
diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix new file mode 100644 index 0000000000000..b0e7e1c839a42 --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -0,0 +1,184 @@ +{ channel, pname, version, sha256Hash }: + +{ android-tools +, bash +, buildFHSEnv +, coreutils +, dpkg +, e2fsprogs +, fetchurl +, findutils +, git +, gnugrep +, gnused +, gnutar +, gtk2, glib +, gzip +, fontsConf +, fontconfig +, freetype +, libX11 +, libXext +, libXi +, libXrandr +, libXrender +, libXtst +, makeFontsConf +, makeWrapper +, ncurses5 +, openssl +, ps +, python3 +, lib +, stdenv +, unzip +, usbutils +, which +, runCommand +, xkeyboard_config +, zip +, zlib +, makeDesktopItem +, tiling_wm ? false # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +}: + +let + drvName = "${pname}-${version}"; + filename = "asfp-${version}-linux.deb"; + + androidStudioForPlatform = stdenv.mkDerivation { + name = "${drvName}-unwrapped"; + + src = fetchurl { + url = "https://dl.google.com/android/asfp/${filename}"; + sha256 = sha256Hash; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + installPhase = '' + cp -r "./opt/${pname}/" $out + wrapProgram $out/bin/studio.sh \ + --set-default JAVA_HOME "$out/jbr" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ + --set FONTCONFIG_FILE ${fontsConf} \ + --prefix PATH : "${lib.makeBinPath [ + + # Checked in studio.sh + coreutils + findutils + gnugrep + which + gnused + + # Used during setup wizard + gnutar + gzip + + # Runtime stuff + git + ps + usbutils + android-tools + + # For Soong sync + openssl + python3 + unzip + zip + e2fsprogs + ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst + libX11 + + # Support multiple monitors + libXrandr + + # For GTKLookAndFeel + gtk2 + glib + + # For Soong sync + e2fsprogs + ]}" + ''; + }; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Android Studio for Platform (${channel} channel)"; + comment = "The official Android IDE for Android platform development"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; + }; + + # Android Studio for Platform downloads prebuilt binaries as part of the SDK. These tools + # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS + # environment is used as a work around for that. + fhsEnv = buildFHSEnv { + name = "${drvName}-fhs-env"; + multiPkgs = pkgs: [ + zlib + ncurses5 + ncurses5.dev + ]; + profile = '' + export ALLOW_NINJA_ENV=true + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32 + ''; + }; +in runCommand + drvName + { + startScript = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudioForPlatform}/bin/studio.sh "$@" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + passthru = { + unwrapped = androidStudioForPlatform; + }; + meta = with lib; { + description = "The Official IDE for Android platform development"; + longDescription = '' + Android Studio for Platform (ASfP) is the version of the Android Studio IDE + for Android Open Source Project (AOSP) platform developers who build with the Soong build system. + ''; + homepage = "https://developer.android.com/studio/platform.html"; + license = with licenses; [ asl20 unfree ]; # The code is under Apache-2.0, but: + # If one selects Help -> Licenses in Android Studio, the dialog shows the following: + # "Android Studio includes proprietary code subject to separate license, + # including JetBrains CLion(R) (www.jetbrains.com/clion) and IntelliJ(R) + # IDEA Community Edition (www.jetbrains.com/idea)." + # Also: For actual development the Android SDK is required and the Google + # binaries are also distributed as proprietary software (unlike the + # source-code itself). + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ robbins ]; + mainProgram = pname; + }; + } + '' + mkdir -p $out/{bin,share/pixmaps} + + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} + + ln -s ${androidStudioForPlatform}/bin/studio.png $out/share/pixmaps/${pname}.png + ln -s ${desktopItem}/share/applications $out/share/applications + '' diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix new file mode 100644 index 0000000000000..1f11bd55ac3a7 --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/default.nix @@ -0,0 +1,31 @@ +{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }: + +let + mkStudio = opts: callPackage (import ./common.nix opts) { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + inherit buildFHSEnv; + inherit tiling_wm; + }; + stableVersion = { + version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 + sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; + }; + canaryVersion = { + version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 + sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; + }; +in { + # Attributes are named by their corresponding release channels + + stable = mkStudio (stableVersion // { + channel = "stable"; + pname = "android-studio-for-platform"; + }); + + canary = mkStudio (canaryVersion // { + channel = "canary"; + pname = "android-studio-for-platform-canary"; + }); +} diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index d9140fc1ea8c3..d560254ee1e69 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -8,7 +8,7 @@ , enchant , gucharmap , python3 -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk libxml2 enchant diff --git a/pkgs/applications/editors/emacs/build-support/buffer.nix b/pkgs/applications/editors/emacs/build-support/buffer.nix new file mode 100644 index 0000000000000..48a7996916e8d --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/buffer.nix @@ -0,0 +1,77 @@ +# Functions to build elisp files to locally configure emcas buffers. +# See https://github.com/shlevy/nix-buffer + +{ lib, writeText, inherit-local }: + +rec { + withPackages = pkgs': let + pkgs = builtins.filter (x: x != null) pkgs'; + extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); + in writeText "dir-locals.el" '' + (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") + + ; Only set up nixpkgs buffer handling when we have some buffers active + (defvar nixpkgs--buffer-count 0) + (when (eq nixpkgs--buffer-count 0) + (make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer) + ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer + (defun nixpkgs--around-generate (orig name &optional ibh) + (if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s)) + (let ((buf (funcall orig name ibh))) + (progn + (inherit-local-inherit-child buf) + (with-current-buffer buf + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t))) + buf) + (funcall orig name ibh))) + (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate) + ; When we have no more nixpkgs buffers, tear down the buffer handling + (defun nixpkgs--decrement-buffer-count () + (setq nixpkgs--buffer-count (1- nixpkgs--buffer-count)) + (when (eq nixpkgs--buffer-count 0) + (advice-remove 'generate-new-buffer #'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--decrement-buffer-count)))) + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t) + + ; Add packages to PATH and exec-path + (make-local-variable 'process-environment) + (put 'process-environment 'permanent-local t) + (inherit-local 'process-environment) + ; setenv modifies in place, so copy the environment first + (setq process-environment (copy-tree process-environment)) + (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) + (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + + (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" (if (boundp 'eshell-path-env) eshell-path-env (getenv "PATH")))) + + (setq nixpkgs--is-nixpkgs-buffer t) + (inherit-local 'nixpkgs--is-nixpkgs-buffer) + + ${lib.concatStringsSep "\n" extras} + ''; + # nix-buffer function for a project with a bunch of haskell packages + # in one directory + haskellMonoRepo = { project-root # The monorepo root + , haskellPackages # The composed haskell packages set that contains all of the packages + }: { root }: + let # The haskell paths. + haskell-paths = lib.filesystem.haskellPathsInDir project-root; + # Find the haskell package that the 'root' is in, if any. + haskell-path-parent = + let filtered = builtins.filter (name: + lib.hasPrefix (toString (project-root + "/${name}")) (toString root) + ) (builtins.attrNames haskell-paths); + in + if filtered == [] then null else builtins.head filtered; + # We're in the directory of a haskell package + is-haskell-package = haskell-path-parent != null; + haskell-package = haskellPackages.${haskell-path-parent}; + # GHC environment with all needed deps for the haskell package + haskell-package-env = + builtins.head haskell-package.env.nativeBuildInputs; + in + lib.optionalAttrs is-haskell-package (withPackages [ haskell-package-env ]); +} diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix new file mode 100644 index 0000000000000..a43578fd3936b --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -0,0 +1,37 @@ +# builder for Emacs packages built for packages.el + +{ lib, stdenv, emacs, texinfo, writeText, gcc }: + +let + handledArgs = [ "files" "fileSpecs" "meta" ]; + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; }; + +in + +{ pname +, version +, src +, meta ? {} +, ... +}@args: + +genericBuild ({ + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + emacs --batch -Q -l ${./elpa2nix.el} \ + -f elpa2nix-install-package \ + "$src" "$out/share/emacs/site-lisp/elpa" + + runHook postInstall + ''; + + meta = { + homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; + } // meta; +} + +// removeAttrs args handledArgs) diff --git a/pkgs/applications/editors/emacs/build-support/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el new file mode 100644 index 0000000000000..64587c0fad1a7 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/elpa2nix.el @@ -0,0 +1,33 @@ +(require 'package) +(package-initialize) + +(defun elpa2nix-install-package () + (if (not noninteractive) + (error "`elpa2nix-install-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,archive ,elpa) + (progn (setq package-user-dir elpa) + (elpa2nix-install-file archive))))) + +(defun elpa2nix-install-from-buffer () + "Install a package from the current buffer." + (let ((pkg-desc (if (derived-mode-p 'tar-mode) + (package-tar-file-info) + (package-buffer-info)))) + ;; Install the package itself. + (package-unpack pkg-desc) + pkg-desc)) + +(defun elpa2nix-install-file (file) + "Install a package from a file. +The file can either be a tar file or an Emacs Lisp file." + (let ((is-tar (string-match "\\.tar\\'" file))) + (with-temp-buffer + (if is-tar + (insert-file-contents-literally file) + (insert-file-contents file)) + (when is-tar (tar-mode)) + (elpa2nix-install-from-buffer)))) + +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) diff --git a/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh new file mode 100644 index 0000000000000..e1e6a3b622087 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh @@ -0,0 +1,34 @@ +addToEmacsLoadPath() { + local lispDir="$1" + if [[ -d $lispDir && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then + # It turns out, that the trailing : is actually required + # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html + export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + fi +} + +addToEmacsNativeLoadPath() { + local nativeDir="$1" + if [[ -d $nativeDir && ${EMACSNATIVELOADPATH-} != *"$nativeDir":* ]]; then + export EMACSNATIVELOADPATH="$nativeDir:${EMACSNATIVELOADPATH-}" + fi +} + +addEmacsVars () { + addToEmacsLoadPath "$1/share/emacs/site-lisp" + + if [ -n "${addEmacsNativeLoadPath:-}" ]; then + addToEmacsNativeLoadPath "$1/share/emacs/native-lisp" + fi + + # Add sub paths to the Emacs load path if it is a directory + # containing .el files. This is necessary to build some packages, + # e.g., using trivialBuild. + for lispDir in \ + "$1/share/emacs/site-lisp/"* \ + "$1/share/emacs/site-lisp/elpa/"*; do + if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" ]] ; then + addToEmacsLoadPath "$lispDir" + fi + done +} diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix new file mode 100644 index 0000000000000..bdf1cd4e50f31 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -0,0 +1,90 @@ +# generic builder for Emacs packages + +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: + +let + inherit (lib) optionalAttrs getLib; + handledArgs = [ "buildInputs" "packageRequires" "meta" ]; + + setupHook = writeText "setup-hook.sh" '' + source ${./emacs-funcs.sh} + + if [[ ! -v emacsHookDone ]]; then + emacsHookDone=1 + + # If this is for a wrapper derivation, emacs and the dependencies are all + # run-time dependencies. If this is for precompiling packages into bytecode, + # emacs is a compile-time dependency of the package. + addEnvHooks "$hostOffset" addEmacsVars + addEnvHooks "$targetOffset" addEmacsVars + fi + ''; + +in + +{ pname +, version +, buildInputs ? [] +, packageRequires ? [] +, meta ? {} +, ... +}@args: + +stdenv.mkDerivation (finalAttrs: ({ + name = "emacs-${pname}-${finalAttrs.version}"; + + unpackCmd = '' + case "$curSrc" in + *.el) + # keep original source filename without the hash + local filename=$(basename "$curSrc") + filename="''${filename:33}" + cp $curSrc $filename + chmod +w $filename + sourceRoot="." + ;; + *) + _defaultUnpack "$curSrc" + ;; + esac + ''; + + buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs; + propagatedBuildInputs = packageRequires; + propagatedUserEnvPkgs = packageRequires; + + inherit setupHook; + + doCheck = false; + + meta = { + broken = false; + platforms = emacs.meta.platforms; + } // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; + } // meta; +} + +// optionalAttrs (emacs.withNativeCompilation or false) { + + LIBRARY_PATH = "${getLib stdenv.cc.libc}/lib"; + + nativeBuildInputs = [ gcc ]; + + addEmacsNativeLoadPath = true; + + postInstall = '' + # Besides adding the output directory to the native load path, make sure + # the current package's elisp files are in the load path, otherwise + # (require 'file-b) from file-a.el in the same package will fail. + mkdir -p $out/share/emacs/native-lisp + source ${./emacs-funcs.sh} + addEmacsVars "$out" + + find $out/share/emacs -type f -name '*.el' -print0 \ + | xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ + "emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true" + ''; +} + +// removeAttrs args handledArgs)) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix new file mode 100644 index 0000000000000..29b3567ec6f40 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -0,0 +1,143 @@ +# builder for Emacs packages built for packages.el +# using MELPA package-build.el + +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: + +let + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; }; + + packageBuild = stdenv.mkDerivation { + name = "package-build"; + src = fetchFromGitHub { + owner = "melpa"; + repo = "package-build"; + rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; + sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; + }; + + patches = [ ./package-build-dont-use-mtime.patch ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = " + mkdir -p $out + cp -r * $out + "; + }; + +in + +{ /* + pname: Nix package name without special symbols and without version or + "emacs-" prefix. + */ + pname + /* + ename: Original Emacs package name, possibly containing special symbols. + Default: pname + */ +, ename ? pname + /* + version: Either a stable version such as "1.2" or an unstable version. + An unstable version can use either Nix format (preferred) such as + "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". + */ +, version + /* + commit: Optional package history commit. + Default: src.rev or "unknown" + This will be written into the generated package but it is not needed during + the build process. + */ +, commit ? (args.src.rev or "unknown") + /* + files: Optional recipe property specifying the files used to build the package. + If null, do not set it in recipe, keeping the default upstream behaviour. + Default: null + */ +, files ? null + /* + recipe: Optional MELPA recipe. + Default: a minimally functional recipe + */ +, recipe ? (writeText "${pname}-recipe" '' + (${ename} :fetcher git :url "" + ${lib.optionalString (files != null) ":files ${files}"}) + '') +, meta ? {} +, ... +}@args: + +genericBuild ({ + + elpa2nix = ./elpa2nix.el; + melpa2nix = ./melpa2nix.el; + + inherit packageBuild commit ename recipe; + + melpaVersion = + let + parsed = lib.flip builtins.match version + # match <version>-unstable-YYYY-MM-DD format + "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; + unstableVersionInNixFormat = parsed != null; # heuristics + date = builtins.concatStringsSep "" parsed; + time = "0"; # unstable version in nix format lacks this info + in + if unstableVersionInNixFormat + then date + "." + time + else version; + + preUnpack = '' + mkdir -p "$NIX_BUILD_TOP/recipes" + if [ -n "$recipe" ]; then + cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename" + fi + + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" + + mkdir -p "$NIX_BUILD_TOP/packages" + ''; + + postUnpack = '' + mkdir -p "$NIX_BUILD_TOP/working" + ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" + ''; + + buildPhase = '' + runHook preBuild + + cd "$NIX_BUILD_TOP" + + emacs --batch -Q \ + -L "$NIX_BUILD_TOP/package-build" \ + -l "$melpa2nix" \ + -f melpa2nix-build-package \ + $ename $melpaVersion $commit + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" + if [ ! -f "$archive" ]; then + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" + fi + + emacs --batch -Q \ + -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$archive" "$out/share/emacs/site-lisp/elpa" + + runHook postInstall + ''; + + meta = { + homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; + } // meta; +} + +// removeAttrs args [ "meta" ]) diff --git a/pkgs/applications/editors/emacs/build-support/melpa2nix.el b/pkgs/applications/editors/emacs/build-support/melpa2nix.el new file mode 100644 index 0000000000000..3de77dbf5e5c6 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/melpa2nix.el @@ -0,0 +1,32 @@ +(require 'package) +(package-initialize) + +(require 'package-recipe) +(require 'package-build) + +(setq package-build-working-dir (expand-file-name "working/")) +(setq package-build-archive-dir (expand-file-name "packages/")) +(setq package-build-recipes-dir (expand-file-name "recipes/")) + +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) + +(defun melpa2nix-build-package-1 (rcp) + (let* ((default-directory (package-recipe--working-tree rcp))) + (unwind-protect + (let ((files (package-build-expand-files-spec rcp t))) + (unless files + (error "Unable to find files matching recipe patterns")) + (if (> (length files) 1) + (package-build--build-multi-file-package rcp files) + (package-build--build-single-file-package rcp files)))))) + +(defun melpa2nix-build-package () + (unless noninteractive + (error "`melpa2nix-build-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,package ,version ,commit) + (let ((recipe (package-recipe-lookup package))) + (setf (oref recipe commit) commit) + (setf (oref recipe version) version) + (melpa2nix-build-package-1 recipe))))) diff --git a/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el new file mode 100644 index 0000000000000..7d30400a5c65f --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el @@ -0,0 +1,6 @@ +(defmacro mk-subdirs-expr (path) + `(setq load-path + (delete-dups (append '(,path) + ',(let ((default-directory path)) + (normal-top-level-add-subdirs-to-load-path)) + load-path)))) diff --git a/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch new file mode 100644 index 0000000000000..1ace7771ea3ac --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch @@ -0,0 +1,21 @@ +diff --git a/package-build.el b/package-build.el +index 29cdb61..c19be1b 100644 +--- a/package-build.el ++++ b/package-build.el +@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory + that is put in the tarball." + (let* ((name (oref rcp name)) + (version (oref rcp version)) +- (time (oref rcp time)) + (tar (expand-file-name (concat name "-" version ".tar") + package-build-archive-dir)) + (dir (concat name "-" version))) +@@ -939,7 +938,7 @@ that is put in the tarball." + ;; prevent a reproducible tarball as described at + ;; https://reproducible-builds.org/docs/archives. + "--sort=name" +- (format "--mtime=@%d" time) ++ "--mtime=@0" + "--owner=0" "--group=0" "--numeric-owner" + "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) + (when (and package-build-verbose noninteractive) diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix new file mode 100644 index 0000000000000..11c28c0133e40 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -0,0 +1,28 @@ +# trivial builder for Emacs packages + +{ callPackage, lib, ... }@envargs: + +args: + +callPackage ./generic.nix envargs ({ + buildPhase = '' + runHook preBuild + + emacs -L . --batch -f batch-byte-compile *.el + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR + emacs --batch -l package --eval "(package-generate-autoloads \"${args.pname}\" \"$LISPDIR\")" + + runHook postInstall + ''; +} + +// args) diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix new file mode 100644 index 0000000000000..59a694286d09e --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix @@ -0,0 +1,236 @@ +/* + +# Usage + +`emacs.pkgs.withPackages` takes a single argument: a function from a package +set to a list of packages (the packages that will be available in +Emacs). For example, +``` +emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) +``` +All the packages in the list should come from the provided package +set. It is possible to add any package to the list, but the provided +set is guaranteed to have consistent dependencies and be built with +the correct version of Emacs. + +# Overriding + +`emacs.pkgs.withPackages` inherits the package set which contains it, so the +correct way to override the provided package set is to override the +set which contains `emacs.pkgs.withPackages`. For example, to override +`emacs.pkgs.emacs.pkgs.withPackages`, +``` +let customEmacsPackages = + emacs.pkgs.overrideScope (self: super: { + # use a custom version of emacs + emacs = ...; + # use the unstable MELPA version of magit + magit = self.melpaPackages.magit; + }); +in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) +``` + +*/ + +{ lib, lndir, makeBinaryWrapper, runCommand, gcc }: +self: +let + inherit (self) emacs; + withNativeCompilation = emacs.withNativeCompilation or false; + withTreeSitter = emacs.withTreeSitter or false; +in +packagesFun: # packages explicitly requested by the user +let + explicitRequires = + if lib.isFunction packagesFun + then packagesFun self + else packagesFun; +in +runCommand + (lib.appendToName "with-packages" emacs).name + { + inherit emacs explicitRequires; + nativeBuildInputs = [ emacs lndir makeBinaryWrapper ]; + + preferLocalBuild = true; + allowSubstitutes = false; + + # Store all paths we want to add to emacs here, so that we only need to add + # one path to the load lists + deps = runCommand "emacs-packages-deps" + ({ + inherit explicitRequires lndir emacs; + nativeBuildInputs = lib.optional withNativeCompilation gcc; + } // lib.optionalAttrs withNativeCompilation { + inherit (emacs) LIBRARY_PATH; + }) + '' + findInputsOld() { + local pkg="$1"; shift + local var="$1"; shift + local propagatedBuildInputsFiles=("$@") + + # TODO(@Ericson2314): Restore using associative array once Darwin + # nix-shell doesn't use impure bash. This should replace the O(n) + # case with an O(1) hash map lookup, assuming bash is implemented + # well :D. + local varSlice="$var[*]" + # ''${..-} to hack around old bash empty array problem + case "''${!varSlice-}" in + *" $pkg "*) return 0 ;; + esac + unset -v varSlice + + eval "$var"'+=("$pkg")' + + if ! [ -e "$pkg" ]; then + echo "build input $pkg does not exist" >&2 + exit 1 + fi + + local file + for file in "''${propagatedBuildInputsFiles[@]}"; do + file="$pkg/nix-support/$file" + [[ -f "$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$file"); do + findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}" + done + done + } + mkdir -p $out/bin + mkdir -p $out/share/emacs/site-lisp + ${lib.optionalString withNativeCompilation '' + mkdir -p $out/share/emacs/native-lisp + ''} + ${lib.optionalString withTreeSitter '' + mkdir -p $out/lib + ''} + + local requires + for pkg in $explicitRequires; do + findInputsOld $pkg requires propagated-user-env-packages + done + # requires now holds all requested packages and their transitive dependencies + + linkPath() { + local pkg=$1 + local origin_path=$2 + local dest_path=$3 + + # Add the path to the search path list, but only if it exists + if [[ -d "$pkg/$origin_path" ]]; then + $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path" + fi + } + + linkEmacsPackage() { + linkPath "$1" "bin" "bin" + linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" + ${lib.optionalString withNativeCompilation '' + linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp" + ''} + ${lib.optionalString withTreeSitter '' + linkPath "$1" "lib" "lib" + ''} + } + + # Iterate over the array of inputs (avoiding nix's own interpolation) + for pkg in "''${requires[@]}"; do + linkEmacsPackage $pkg + done + + siteStart="$out/share/emacs/site-lisp/site-start.el" + siteStartByteCompiled="$siteStart"c + subdirs="$out/share/emacs/site-lisp/subdirs.el" + subdirsByteCompiled="$subdirs"c + + # A dependency may have brought the original siteStart or subdirs, delete + # it and create our own + # Begin the new site-start.el by loading the original, which sets some + # NixOS-specific paths. Paths are searched in the reverse of the order + # they are specified in, so user and system profile paths are searched last. + # + # NOTE: Avoid displaying messages early at startup by binding + # inhibit-message to t. This would prevent the Emacs GUI from showing up + # prematurely. The messages would still be logged to the *Messages* + # buffer. + rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled + cat >"$siteStart" <<EOF + (let ((inhibit-message t)) + (load "$emacs/share/emacs/site-lisp/site-start")) + ;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh + ;; "$out/share/emacs/native-lisp" is added to native-comp-eln-load-path in wrapper.sh + (add-to-list 'exec-path "$out/bin") + ${lib.optionalString withTreeSitter '' + (add-to-list 'treesit-extra-load-path "$out/lib/") + ''} + EOF + + # Generate a subdirs.el that statically adds all subdirectories to load-path. + $emacs/bin/emacs \ + --batch \ + --load ${./mk-wrapper-subdirs.el} \ + --eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \ + > "$subdirs" + + # Byte-compiling improves start-up time only slightly, but costs nothing. + $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" + + ${lib.optionalString withNativeCompilation '' + $emacs/bin/emacs --batch \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ + -f batch-native-compile "$siteStart" "$subdirs" + ''} + ''; + + inherit (emacs) meta; + } + '' + mkdir -p "$out/bin" + + # Wrap emacs and friends so they find our site-start.el before the original. + for prog in $emacs/bin/*; do # */ + local progname=$(basename "$prog") + rm -f "$out/bin/$progname" + + substitute ${./wrapper.sh} $out/bin/$progname \ + --subst-var-by bash ${emacs.stdenv.shell} \ + --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ + --subst-var prog + chmod +x $out/bin/$progname + # Create a “NOP” binary wrapper for the pure sake of it becoming a + # non-shebang, actual binary. See the makeBinaryWrapper docs for rationale + # (summary: it allows you to use emacs as a shebang itself on Darwin, + # e.g. #!$ {emacs}/bin/emacs --script) + wrapProgramBinary $out/bin/$progname + done + + # Wrap MacOS app + # this has to pick up resources and metadata + # to recognize it as an "app" + if [ -d "$emacs/Applications/Emacs.app" ]; then + mkdir -p $out/Applications/Emacs.app/Contents/MacOS + cp -r $emacs/Applications/Emacs.app/Contents/Info.plist \ + $emacs/Applications/Emacs.app/Contents/PkgInfo \ + $emacs/Applications/Emacs.app/Contents/Resources \ + $out/Applications/Emacs.app/Contents + + + substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ + --subst-var-by bash ${emacs.stdenv.shell} \ + --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ + --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" + chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs + wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs + fi + + mkdir -p $out/share + # Link icons and desktop files into place + for dir in applications icons info man; do + ln -s $emacs/share/$dir $out/share/$dir + done + '' diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh new file mode 100644 index 0000000000000..44762bd4582b0 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/wrapper.sh @@ -0,0 +1,53 @@ +#!@bash@ + +IFS=: + +newLoadPath=() +newNativeLoadPath=() +addedNewLoadPath= +addedNewNativeLoadPath= + +if [[ -n $EMACSLOADPATH ]] +then + while read -rd: entry + do + if [[ -z $entry && -z $addedNewLoadPath ]] + then + newLoadPath+=(@wrapperSiteLisp@) + addedNewLoadPath=1 + fi + newLoadPath+=("$entry") + done <<< "$EMACSLOADPATH:" +else + newLoadPath+=(@wrapperSiteLisp@) + newLoadPath+=("") +fi + +# NOTE: Even though we treat EMACSNATIVELOADPATH like EMACSLOADPATH in +# this wrapper, empty elements in EMACSNATIVELOADPATH have no special +# meaning for Emacs. Only non-empty elements in EMACSNATIVELOADPATH +# will be prepended to native-comp-eln-load-path. +# https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n599 +if [[ -n $EMACSNATIVELOADPATH ]] +then + while read -rd: entry + do + if [[ -z $entry && -z $addedNewNativeLoadPath ]] + then + newNativeLoadPath+=(@wrapperSiteLispNative@) + addedNewNativeLoadPath=1 + fi + newNativeLoadPath+=("$entry") + done <<< "$EMACSNATIVELOADPATH:" +else + newNativeLoadPath+=(@wrapperSiteLispNative@) + newNativeLoadPath+=("") +fi + +export EMACSLOADPATH="${newLoadPath[*]}" +export emacsWithPackages_siteLisp=@wrapperSiteLisp@ + +export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}" +export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@ + +exec @prog@ "$@" diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 29e2c2d85f495..8181b69d335d2 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,25 +4,14 @@ lib.makeScope pkgs.newScope (self: let gconf = pkgs.gnome2.GConf; inherit (self) callPackage; - stdenv = if pkgs.stdenv.isDarwin - then pkgs.darwin.apple_sdk_11_0.stdenv - else pkgs.stdenv; inheritedArgs = { inherit gconf; - inherit stdenv; inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit - Quartz QuartzCore UniformTypeIdentifiers WebKit; - gnutls = - if pkgs.stdenv.isDarwin - then pkgs.gnutls.override { - inherit stdenv; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; - } - else pkgs.gnutls; + Quartz QuartzCore WebKit; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers; }; in { sources = import ./sources.nix { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 192320fab674d..f02b98e5f22dc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -32,7 +32,7 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { + elpaBuild = import ../build-support/elpa.nix { inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3e8ab4625fec2..4f3bdc44eb61b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -32,7 +32,7 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { + elpaBuild = import ../build-support/elpa.nix { inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix index 36576f7c12398..391065ccfb20d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix @@ -79,7 +79,8 @@ in { lib.nameValuePair ename ( self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { - inherit pname ename commit; + inherit pname ename; + inherit (sourceArgs) commit; version = lib.optionalString (version != null) (lib.concatStringsSep "." (map toString # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413 diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index fbd16c3f47af0..07e234fca98b7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -7,11 +7,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.71"; + version = "1.72"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-HvaiH3I6hJMb1XFFf8FOw22X+47UayCIWAGuXAVP/ls="; + hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc="; }; # not used but needs to be set; why? diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index b85128816aa61..944fc6c49463b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "4bfbbe4e6c44d80b15cb501fa3444ad03dba2824"; + rev = "9e88e660d717ba597d9fe9366cf4278674734410"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240622.236"; + version = "20240629.1404"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-rzaUtUYDEZAuRjSgThHKxrQ7U8ZIO0k750aH08VpA08="; + hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA="; }; commit = rev; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 1e9a8191b3f16..00646b6d81b38 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -23,6 +23,11 @@ formats commits for you. */ +let + # Read ./recipes-archive-melpa.json in an outer let to make sure we only do this once. + defaultArchive = builtins.fromJSON (builtins.readFile ./recipes-archive-melpa.json); +in + { lib, pkgs }: variant: self: let dontConfigure = pkg: @@ -57,7 +62,7 @@ let if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags) else null; - generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive }: let inherit (import ./libgenerated.nix lib self) melpaDerivation; @@ -66,7 +71,7 @@ let (s: s != null) (map (melpaDerivation variant) - (lib.importJSON archiveJson) + (if builtins.isList archiveJson then archiveJson else lib.importJSON archiveJson) ) ) ); diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 59cced7ec49a5..b460fad5bb3ab 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -298,12 +298,13 @@ mkDerivation (finalAttrs: { OSAKit Quartz QuartzCore - UniformTypeIdentifiers WebKit # TODO are these optional? GSS ImageCaptureCore ImageIO + ] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [ + UniformTypeIdentifiers ]; # Emacs needs to find movemail at run time, see info (emacs) Movemail diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 487d8a3680a6d..da243044b689a 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -104,10 +104,10 @@ in emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "29.3"; + version = "29.4"; variant = "mainline"; - rev = "29.3"; - hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0="; + rev = "29.4"; + hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 2c9ecd828a643..efa6aaf4cbdbd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -12,6 +12,7 @@ , libgedit-gtksourceview , libgedit-tepl , libgee +, adwaita-icon-theme , gnome , glib , pkg-config @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fb57331cc3b46..af155d9de826c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,3 +1,10 @@ +let + # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata + # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes + ideInfo = builtins.fromJSON (builtins.readFile ./bin/ides.json); + versions = builtins.fromJSON (builtins.readFile ./bin/versions.json); +in + { lib , stdenv , callPackage @@ -30,10 +37,6 @@ let inherit (stdenv.hostPlatform) system; - # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata - # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes - ideInfo = lib.importJSON ./bin/ides.json; - versions = lib.importJSON ./bin/versions.json; products = versions.${system} or (throw "Unsupported system: ${system}"); package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index 1ad346ed01de0..d2203a714c374 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; homepage = "https://github.com/stevenhoneyman/l3afpad"; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; mainProgram = "l3afpad"; }; diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/applications/editors/neovim/neovim-gtk.nix deleted file mode 100644 index eebb980f85cb5..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-gtk.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, wrapGAppsHook4 -, pkg-config -, gdk-pixbuf -, gtk4 -, pango -, vte-gtk4 -}: - -rustPlatform.buildRustPackage rec { - pname = "neovim-gtk"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "Lyude"; - repo = pname; - rev = "v${version}"; - hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; - }; - - cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; - - nativeBuildInputs = [ wrapGAppsHook4 pkg-config ]; - - buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; - - postInstall = '' - make PREFIX=$out install-resources - ''; - - meta = with lib; { - description = "Gtk ui for neovim"; - homepage = "https://github.com/Lyude/neovim-gtk"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aleksana ]; - mainProgram = "nvim-gtk"; - }; -} diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix deleted file mode 100644 index f85d379faa85c..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, neovim -, fetchpatch -}: - -with python3.pkgs; buildPythonApplication rec { - pname = "neovim-remote"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "mhinz"; - repo = "neovim-remote"; - rev = "v${version}"; - sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq"; - }; - - patches = [ - # Fix a compatibility issue with neovim 0.8.0 - (fetchpatch { - url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch"; - hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM="; - }) - ]; - - propagatedBuildInputs = [ - pynvim - psutil - setuptools - ]; - - nativeCheckInputs = [ - neovim - pytestCheckHook - ]; - - doCheck = !stdenv.isDarwin; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - meta = with lib; { - description = "Tool that helps controlling nvim processes from a terminal"; - homepage = "https://github.com/mhinz/neovim-remote/"; - license = licenses.mit; - maintainers = with maintainers; [ edanaher ]; - platforms = platforms.unix; - mainProgram = "nvr"; - }; -} diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index b07f517ea474a..c2e6b565de282 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -43,6 +43,14 @@ let ''; }; + nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + plugins = [ { + plugin = vimPlugins.luasnip; + + } + ]; + }); + nvimAutoDisableWrap = makeNeovimConfig { }; wrapNeovim2 = suffix: config: @@ -281,4 +289,16 @@ rec { export HOME=$TMPDIR ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e ''; + + inherit nvim-with-luasnip; + + # check that bringing in one plugin with lua deps makes those deps visible from wrapper + # for instance luasnip has a dependency on jsregexp + can_require_transitive_deps = + runTest nvim-with-luasnip '' + export HOME=$TMPDIR + cat ${nvim-with-luasnip}/bin/nvim + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e + ''; + }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 8f9a5b880032c..9f0aa86de48ca 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -7,7 +7,6 @@ , ruby , lua , python3Packages -, writeText , wrapNeovimUnstable , runCommand }: @@ -78,7 +77,7 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages); + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; # as expected by packdir packpathDirs.myNeovimPackages = myVimPackage; @@ -101,13 +100,13 @@ let "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; - manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; + manifestRc = vimUtils.vimrcContent { customRC = ""; }; # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent ({ + neovimRcContent = vimUtils.vimrcContent { beforePlugins = ""; customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); packages = null; - }); + }; in builtins.removeAttrs args ["plugins"] // { @@ -225,16 +224,57 @@ let } // grammar.meta; } '' - mkdir -p $out/parser - ln -s ${grammar}/parser $out/parser/${name}.so + mkdir -p "$out/parser" + ln -s "${grammar}/parser" "$out/parser/${name}.so" + + mkdir -p "$out/queries/${name}" + if [ -d "${grammar}/queries/${name}" ]; then + echo "moving queries from neovim queries dir" + for file in "${grammar}/queries/${name}"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + if [ -d "${grammar}/queries" ]; then + echo "moving queries from standard queries dir" + for file in "${grammar}/queries/"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + echo "missing queries for ${name}" + fi + fi ''); + /* + Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that + can be used by the lua hooks to generate a proper LUA_PATH + + Generates a packpath folder as expected by vim + Example: + packDir ( {myVimPackage = { start = [ vimPlugins.vim-fugitive ]; opt = []; }; }) + => "/nix/store/xxxxx-pack-dir" + */ + packDir = packages: + let + rawPackDir = vimUtils.packDir packages; + + in + rawPackDir.override ({ + postBuild = '' + mkdir $out/nix-support + for i in $(find -L $out -name propagated-build-inputs ); do + cat "$i" >> $out/nix-support/propagated-build-inputs + done + '';}); + + in { inherit makeNeovimConfig; inherit generateProviderRc; inherit legacyWrapper; inherit grammarToPlugin; + inherit packDir; inherit buildNeovimPlugin; buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index e877f1e1f764a..d86de46c87385 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -13,6 +13,9 @@ neovim-unwrapped: let + # inherit interpreter from neovim + lua = neovim-unwrapped.lua; + wrapper = { extraName ? "" # should contain all args but the binary. Can be either a string or list @@ -24,6 +27,8 @@ let , withNodeJs ? false , withPerl ? false , rubyEnv ? null + + # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim , vimAlias ? false , viAlias ? false @@ -45,6 +50,8 @@ let stdenv.mkDerivation (finalAttrs: let + finalPackdir = neovimUtils.packDir packpathDirs; + rcContent = '' ${luaRcContent} '' + lib.optionalString (!isNull neovimRcContent) '' @@ -57,10 +64,10 @@ let # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' - # (lib.intersperse "|" hostProviderViml) - ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ - "--add-flags" ''--cmd "set packpath^=${vimUtils.packDir packpathDirs}"'' - "--add-flags" ''--cmd "set rtp^=${vimUtils.packDir packpathDirs}"'' + ] + ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ + "--add-flags" ''--cmd "set packpath^=${finalPackdir}"'' + "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] ; @@ -160,7 +167,17 @@ let + '' rm $out/bin/nvim touch $out/rplugin.vim - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} + + echo "Looking for lua dependencies..." + source ${lua}/nix-support/utils.sh + + _addToLuaPath "${finalPackdir}" + + echo "LUA_PATH towards the end of packdir: $LUA_PATH" + + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} \ + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; buildPhase = '' diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 298f1c2f135e4..10e6a04498ab5 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -10,7 +10,7 @@ , aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. -, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] +, enchantAspellDicts ? with aspellDicts; [ en en-computers ] }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3278fc9ef158f..983d661fef52d 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -38,7 +38,7 @@ let pname = "RStudio"; - version = "2024.04.1+748"; + version = "2024.04.2+764"; RSTUDIO_VERSION_MAJOR = lib.versions.major version; RSTUDIO_VERSION_MINOR = lib.versions.minor version; RSTUDIO_VERSION_PATCH = lib.versions.patch version; @@ -50,7 +50,7 @@ let owner = "rstudio"; repo = "rstudio"; rev = "v" + version; - hash = "sha256-fzxbhN9NdM0E2rxezj2BMEZ8obUbX0Zw8haDNmfAkWs="; + hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; }; mathJaxSrc = fetchurl { @@ -134,39 +134,29 @@ in ./pandoc-nix-path.patch ./use-system-quarto.patch ./ignore-etc-os-release.patch - - (fetchpatch { - name = "use-system-yaml-patch"; - url = "https://github.com/rstudio/rstudio/commit/04de8ca8b83dcc7fee9fd65e6ef58c372489d5ef.patch"; - hash = "sha256-FHSSOPsw6AAYBj/fgNT6idyxvRj3SG+fbla0UDjug1Y="; - }) - ]; postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - - substituteInPlace src/cpp/CMakeLists.txt \ - --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R} substituteInPlace src/gwt/build.xml \ - --replace '@node@' ${nodejs} \ - --replace './lib/quarto' ${quartoSrc} + --replace-fail '@node@' ${nodejs} \ + --replace-fail './lib/quarto' ${quartoSrc} substituteInPlace src/cpp/conf/rsession-dev.conf \ - --replace '@node@' ${nodejs} + --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ + --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ - --replace '@pandoc@' ${pandoc} \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc} \ + --replace-fail '@quarto@' ${quarto} substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc}/bin \ + --replace-fail '@quarto@' ${quarto} ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -189,10 +179,10 @@ in unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 - # As of Chocolate Cosmos, node 18.19.1 is used for runtime + # As of Chocolate Cosmos, node 18.20.3 is used for runtime # 18.18.2 is still used for build # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780 - mkdir -p dependencies/common/node/18.19.1 + mkdir -p dependencies/common/node/18.20.3 mkdir -p dependencies/pandoc/${pandoc.version} cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d2e3013a782d9..50de9c6bfb79e 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0412"; + version = "9.1.0509"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI="; + hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 5c436307897f4..cca5d06ba90ad 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,8 +1,6 @@ { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let - macvim = callPackage ./macvim.nix { inherit stdenv; }; - makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } @@ -62,5 +60,4 @@ let override = f: makeCustomizable (macvim.override f); overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); }; -in - makeCustomizable macvim +in { inherit makeCustomizable; } diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 64aa5b639a9b4..bd526b8f6ce22 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,15 +6,23 @@ , gettext , pkg-config , cscope -, ruby +, ruby_3_2 , tcl -, perl +, perl536 , luajit , darwin , libiconv , python3 }: +# Try to match MacVim's documented script interface compatibility +let + # Perl 5.30 - closest we get is 5.36. 5.38 is currently failing + perl = perl536; + # Ruby 3.2 + ruby = ruby_3_2; +in + let # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -26,16 +34,16 @@ let ''; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "8.2.3455"; + version = "178"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-172"; - sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; + rev = "release-${finalAttrs.version}"; + hash = "sha256-JYh5fyaYuME/Lk67vrf1hYOIcAkEbwtslcnI9KRzHa8="; }; enableParallelBuilding = true; @@ -48,26 +56,26 @@ stdenv.mkDerivation { patches = [ ./macvim.patch ]; configureFlags = [ - "--enable-cscope" - "--enable-fail-if-missing" - "--with-features=huge" - "--enable-gui=macvim" - "--enable-multibyte" - "--enable-nls" - "--enable-luainterp=dynamic" - "--enable-python3interp=dynamic" - "--enable-perlinterp=dynamic" - "--enable-rubyinterp=dynamic" - "--enable-tclinterp=yes" - "--without-local-dir" - "--with-luajit" - "--with-lua-prefix=${luajit}" - "--with-python3-command=${python3}/bin/python3" - "--with-ruby-command=${ruby}/bin/ruby" - "--with-tclsh=${tcl}/bin/tclsh" - "--with-tlib=ncurses" - "--with-compiledby=Nix" - "--disable-sparkle" + "--enable-cscope" + "--enable-fail-if-missing" + "--with-features=huge" + "--enable-gui=macvim" + "--enable-multibyte" + "--enable-nls" + "--enable-luainterp=dynamic" + "--enable-python3interp=dynamic" + "--enable-perlinterp=dynamic" + "--enable-rubyinterp=dynamic" + "--enable-tclinterp=yes" + "--without-local-dir" + "--with-luajit" + "--with-lua-prefix=${luajit}" + "--with-python3-command=${python3}/bin/python3" + "--with-ruby-command=${ruby}/bin/ruby" + "--with-tclsh=${tcl}/bin/tclsh" + "--with-tlib=ncurses" + "--with-compiledby=Nix" + "--disable-sparkle" ]; # Remove references to Sparkle.framework from the project. @@ -78,37 +86,45 @@ stdenv.mkDerivation { sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj ''; - # This is unfortunate, but we need to use the same compiler as Xcode, - # but Xcode doesn't provide a way to configure the compiler. - preConfigure = '' - CC=/usr/bin/clang - - DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer - configureFlagsArray+=( - --with-developer-dir="$DEV_DIR" - LDFLAGS="-L${ncurses}/lib" - CPPFLAGS="-isystem ${ncurses.dev}/include" - CFLAGS="-Wno-error=implicit-function-declaration" - ) - '' - # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it - # passes arguments to ld that it meant for clang. - + '' - unset LD - '' - # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use - # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath - # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim - # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default - # behavior to build the first target in the project. Experimentally, there seems to be a scheme - # called MacVim, so we'll explicitly select that. We also need to specify the configuration too - # as the scheme seems to have the wrong default. - + '' - configureFlagsArray+=( - XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" - --with-xcodecfg="Release" - ) - '' + # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a + # way to configure the compiler. We also need to pull in lib/include paths for some of our build + # inputs since we don't have cc-wrapper to do that for us. + preConfigure = + let + # ideally we'd recurse, but we don't need that right now + inputs = [ ncurses ] ++ perl.propagatedBuildInputs; + ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs; + cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; + in + '' + CC=/usr/bin/clang + + DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer + configureFlagsArray+=( + --with-developer-dir="$DEV_DIR" + LDFLAGS=${lib.escapeShellArg ldflags} + CPPFLAGS=${lib.escapeShellArg cppflags} + CFLAGS="-Wno-error=implicit-function-declaration" + ) + '' + # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it + # passes arguments to ld that it meant for clang. + + '' + unset LD + '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + --with-xcodecfg="Release" + ) + '' ; # Because we're building with system clang, this means we're building against Xcode's SDK and @@ -124,7 +140,7 @@ stdenv.mkDerivation { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ + --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \ --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ @@ -143,17 +159,25 @@ stdenv.mkDerivation { substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope ''; + # Note that $out/MacVim.app has a misnamed set of binaries in the Contents/bin folder (the V is + # capitalized) and is missing a bunch of them. This is why we're grabbing the version from the + # build folder. postInstall = '' mkdir -p $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm -rf $out/MacVim.app - rm $out/bin/* - - cp src/vimtutor $out/bin - for prog in mvim ex vi vim vimdiff view rvim rvimdiff rview; do + mkdir -p $out/bin + for prog in ex vi {,g,m,r}vi{m,mdiff,ew}; do ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog done + for prog in {,g}vimtutor xxd; do + ln -s $out/Applications/MacVim.app/Contents/bin/$prog $out/bin/$prog + done + ln -s $out/Applications/MacVim.app/Contents/bin/gvimtutor $out/bin/mvimtutor + + mkdir -p $out/share + ln -s $out/Applications/MacVim.app/Contents/man $out/share/man # Fix rpaths exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" @@ -165,7 +189,7 @@ stdenv.mkDerivation { install_name_tool -add_rpath ${ruby}/lib $exe # Remove manpages from tools we aren't providing - find $out/share/man \( -name eVim.1 -or -name xxd.1 \) -delete + find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete ''; # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and @@ -179,10 +203,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Vim - the text editor - for macOS"; - homepage = "https://github.com/macvim-dev/macvim"; + homepage = "https://macvim.org/"; license = licenses.vim; - maintainers = with maintainers; [ lilyball ]; - platforms = platforms.darwin; + maintainers = with maintainers; [ ]; + platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; -} +}) diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 6af3e384a63c1..223778acf60cc 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,50 +1,60 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 32c89b387..c2af70127 100644 +index 162af04..4322049 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -9,35 +9,5 @@ set nocompatible +@@ -9,45 +9,7 @@ set nocompatible " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. set backspace+=indent,eol,start -" Python2 --" MacVim is configured by default to use the pre-installed System python2 --" version. However, following code tries to find a Homebrew, MacPorts or --" an installation from python.org: +-" MacVim is configured by default in the binary release to use the +-" pre-installed System python2 version. However, following code tries to +-" find a Homebrew, MacPorts or an installation from python.org: -if exists("&pythondll") && exists("&pythonhome") +- " Homebrew python 2.7 - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") -- " Homebrew python 2.7 - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python +- +- " MacPorts python 2.7 - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " MacPorts python 2.7 - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python +- +- " https://www.python.org/downloads/mac-osx/ - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " https://www.python.org/downloads/mac-osx/ - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python - endif -endif - -" Python3 --" MacVim is configured by default to use Homebrew python3 version --" If this cannot be found, following code tries to find a MacPorts --" or an installation from python.org: +-" MacVim is configured by default in the binary release to set +-" pythonthreedll to Homebrew python3. If it cannot be found, the following +-" code tries to find Python3 from other popular locations. Note that we are +-" using "Current" for the version, because Vim supports the stable ABI and +-" therefore any new version of Python3 will work. -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " MacPorts python 3.9 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python +- " MacPorts python +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python +- +- " macOS default Python, installed by 'xcode-select --install' +- elseif filereadable("/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3") +- set pythonthreedll=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3 +- +- " https://www.python.org/downloads/mac-osx/ +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/Current/Python - endif -endif -- +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ + + " vim: sw=2 ts=2 et diff --git a/src/Makefile b/src/Makefile -index c4a3ada37..06ee3de44 100644 +index 5b4cdff..72fee3a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1290,7 +1290,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -54,10 +64,10 @@ index c4a3ada37..06ee3de44 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 39ef81449..d8fa7ec2f 100755 +index ecf10c4..4b691d0 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } +@@ -6247,10 +6247,7 @@ printf "%s\n" "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +79,7 @@ index 39ef81449..d8fa7ec2f 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6646,23 +6643,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +103,7 @@ index 39ef81449..d8fa7ec2f 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6526,13 +6506,6 @@ __: +@@ -6902,13 +6882,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,10 +114,11 @@ index 39ef81449..d8fa7ec2f 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else ++ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6547,7 +6520,6 @@ eof +@@ -6923,7 +6897,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -115,8 +126,8 @@ index 39ef81449..d8fa7ec2f 100755 fi -@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ - $as_echo "no" >&6; } +@@ -7004,13 +6977,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ + printf "%s\n" "no" >&6; } fi - if test -n "$MACSDK"; then @@ -126,13 +137,13 @@ index 39ef81449..d8fa7ec2f 100755 - PYTHON_GETPATH_CFLAGS= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 - $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 + printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -8060,11 +8026,7 @@ printf "%s\n" "$tclver - OK" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 - $as_echo_n "checking for location of Tcl include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 + printf %s "checking for location of Tcl include... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" - else @@ -141,10 +152,10 @@ index 39ef81449..d8fa7ec2f 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7579,13 +7540,8 @@ $as_echo "<not found>" >&6; } +@@ -8082,13 +8044,8 @@ printf "%s\n" "<not found>" >&6; } if test -z "$SKIP_TCL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 - $as_echo_n "checking for location of tclConfig.sh script... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 + printf %s "checking for location of tclConfig.sh script... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" @@ -154,8 +165,8 @@ index 39ef81449..d8fa7ec2f 100755 - fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +@@ -8285,10 +8242,6 @@ printf "%s\n" "$rubyhdrdir" >&6; } rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -167,10 +178,10 @@ index 39ef81449..d8fa7ec2f 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index 4ff59f201..f91cb9836 100644 +index 6e33142..6185f45 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -244,17 +244,6 @@ +@@ -270,17 +270,6 @@ # define SUN_SYSTEM #endif @@ -189,10 +200,10 @@ index 4ff59f201..f91cb9836 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 3b154f288..e89f26060 100755 +index 3b154f2..e89f260 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" +@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" if test "$1" = "-g"; then # Try to use the GUI version of Vim if possible, it will fall back # on Vim if Gvim is not installed. @@ -200,3 +211,4 @@ index 3b154f288..e89f26060 100755 + seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" shift fi + diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index d679dfed6db4c..60a28dd327dbb 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-06-19", + "date": "2024-07-03", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-06-19", + "date": "2024-07-03", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 213806b2f402a..1f72134b2e520 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-03-06"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "df53728e05129278d6ea26271ec086aa013bed90"; - sha256 = "0yh7awf26cqfndhliizi0mfqj2111hicg3hlqjjiag96qq9csgdw"; + rev = "f081338f07216a46d3915ce46c1fcb083bcb5016"; + sha256 = "1hgwdahp5h2nfzwfgjjgdbki5jnyg5gmapvz1kd1zmcycslb85di"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-15"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a36352930b5e5f8d33dda09eef0c9d7c96190a02"; - sha256 = "07vy515qgfc6f1y96dn0ykm0kh3ylkhf6igb23f4jv608ylz4f12"; + rev = "c1dc30666c957815b012ae67e8e61de6b48ecf86"; + sha256 = "17hrsjxyr9f59h790gvwk8gmp7zzfjjsnvb5a5lpqa0q4yxq3fzv"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "67eece6d74f071035ca7b934a753d71d1677dd9b"; - sha256 = "15r8n3ch609lifv8lvyis5kn663c6jjj4zkzhyn4v4cxcxj3lb5d"; + rev = "1f603f9074118ee9975b2af0308452ca324640e5"; + sha256 = "0p9rrhlxa1dy5ym85jhr8zxai7zng0sikf5v0ywdi09vryknygxb"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "11c08af2ae56fac83772d21aa5133913784ca2c4"; - sha256 = "1yld7h2s1yr5l65iagk51xx4znf1vh5m7c5c4gmmp5zr2px0bn8b"; + rev = "ea67d004f86ac10e29708fbb4de84f72b87df612"; + sha256 = "15pdsx91cbl4ig7ph5nbrqm42l08wbs9dvn2d80p922ywm4vjxdq"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -267,6 +267,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; + Preview-nvim = buildVimPlugin { + pname = "Preview.nvim"; + version = "2024-06-01"; + src = fetchFromGitHub { + owner = "henriklovhaug"; + repo = "Preview.nvim"; + rev = "388882f3bfd09bcb0d5b4ab3d0fa5bc2dacbbc2e"; + sha256 = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU="; + }; + meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/"; + }; + QFEnter = buildVimPlugin { pname = "QFEnter"; version = "2024-05-05"; @@ -317,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "35f36c50b9f1e1e916d0e3f004cb48dffd2bf737"; - sha256 = "0a3488c74hrykcmharzza5svy9c0smw9yzafpdsgw10adav2mxqb"; + rev = "b606847df9f91ab6a7d0484c2e3fae096c9fe028"; + sha256 = "13whydyh7wrw0wfpbx9sn330nybbggcks5866fqpx05zdkcv1kfc"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -389,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-06-02"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "af055c0c73e4d49c57acbb40d9f6e248f2a38d52"; - sha256 = "1ngh7m1mkam8vavpzgym3nii25ivw2b557hj72mi2j1f18xgvf90"; + rev = "e2250a99f7c3c0247d7e7456ee1bceb17aee1927"; + sha256 = "13152c34vzxpag8k6r3z0sk2mh1nyl3v76l893iwdi3q9hw8r9wr"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -461,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-03-20"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4556062839aa2e86f2f4f1c0b4532697d607af23"; - sha256 = "14391a213340agjafvraw1az21vj940y7ddwqwbbsrj4q18si7av"; + rev = "b5fe27bb82cc375d66a9a006cf30390bdb215ed2"; + sha256 = "1fm8dbdr26zknxcyiah7jz1v0h9cx0g4dg9c9vrm3w3ibbpy2jf0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -534,12 +546,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-06-17"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "eb25396dae306cef5b8fffbe9ae98283d2f1c199"; - sha256 = "1byzkpcc77a2zwlypgmcmzik816i4qcaydb8ssy0vxrf3nsjx9s4"; + rev = "db0af491ff13c18a966ce2f9ac7f5211aec000a7"; + sha256 = "0v0064c0prsxm7z151nd7fvfwq6na5agbh3dqnj9whnwx0k0l2zl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -595,12 +607,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-06-02"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c7c41e157478fc9d4f65e9f640bfce75fa211fd7"; - sha256 = "1g7q3nc0y0k1hwg22mqcwypsriss6q12bx1d653sg5jsm7l8lrck"; + rev = "a35fa4d732220914d620deccbc8ef68fa1bff96f"; + sha256 = "17afk45cs61zvk01kg9brl86k4czgfvsrg87zdaszw2abhxrqgi4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -823,12 +835,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-05-22"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "182c636909cfd41e1d72e1278a7db6a4e5271b81"; - sha256 = "0mbr0abpwj45bnc3riv3mgfj9ic3xjbxkgwmkzjrr42zw208rki5"; + rev = "b0987750dddf0ee678d160fe50e3d5397cd0c9e9"; + sha256 = "0ifnfif65ykpkavaajwiqc8pi38c0x7b709kx1gvn0z7nr8gxf7p"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -919,12 +931,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-05-21"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "af2219b9fa99c1d7ac409bd9eac094c459d3f52d"; - sha256 = "16qs3xqlfcdcrd9phyf180hhcp28cc4z2lsg68zr3jhdlyls6yxj"; + rev = "7b1b30d3424b7ca0fb4d12ce3f3d1977cf7c5691"; + sha256 = "0dqq4na08bcpw2668ykcih5rw83k3a138x3a6q9i26wzmviyvkq5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1040,12 +1052,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-18"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "a1b2661f3cb248ae4fafc0cc50ca2588532e231d"; - sha256 = "0f004i98g6jvgnl561bmhzga09gdh1nizk95ahyyg6y5bkqkbrn8"; + rev = "b67ea789efd5e81692c802d2b42629db79683da1"; + sha256 = "0j16j20psjqgl4jmzh3ajrz5zzz85fs0nyg5gyp247cka5zljhr9"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1100,12 +1112,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-06-02"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "87e09eb9e959966397bd9d8aab18d88ef349c913"; - sha256 = "1j2hm9400dlynkzxyxqzp4rz4kxjai5hiqv4b3lxg21g49lq5aa6"; + rev = "d4ffecc3e1a34f3ed9af6362529552eee79e57c2"; + sha256 = "11k0slasxzyj1xifvlj6fy1kajnlvk5kyv05f70c7k9a3kn79jpx"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1304,12 +1316,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-05-24"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe"; - sha256 = "00rvijzj17449zmsiqwp8ybcsdd84frny3kl3b7wm57bbiis9w7h"; + rev = "81820cac7c85e51e4cf179f8a66d13dbf7b032d9"; + sha256 = "1z4i45gnh71ayqxkibd7zb07k1k9y0mk6pnldbmv73nhwi9m2ypw"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1376,12 +1388,12 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-06-03"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "22924b7bde685e1816140f17a897950ef82b969a"; - sha256 = "18np41as7j6axbfl5l1cv5b0xpsslfj6pcc8ih1sax4awnfbpf46"; + rev = "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4"; + sha256 = "00916cwvdg3rccmf4vg811gi03gpdrpsndpr9ady29dii2alb6pb"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1436,12 +1448,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "513154670f9e174e0b5dc75dd0662c5da493c284"; - sha256 = "0apnz8qmj0173dw4nnxj3zjr5695f20za599pwlmfrld0nfgaqc2"; + rev = "b6c406e2b941abbb334388d6d3e82a737e47ae11"; + sha256 = "0lw2q6hjc6yd8p6afkswp40lgg4i5agjyj161mp05lvdp06jb05x"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1460,12 +1472,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-05-28"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "665de14b9a61067a706a53c233e67126f7edf53e"; - sha256 = "11v9jxk4wln7i542mjswh964dsy8isanzhpy2px4pqnwaxq58cy7"; + rev = "cced9374c8b15eb466d67ce1c56e854abd1f0d46"; + sha256 = "1gfxnc22warpbxw6qykrc3850k3ij1zyrhx85ln57kzhsngamy5x"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1544,24 +1556,24 @@ final: prev: close-buffers-vim = buildVimPlugin { pname = "close-buffers.vim"; - version = "2020-09-23"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "asheq"; repo = "close-buffers.vim"; - rev = "0b29fbc483344e2ebec96a28070698d72a8a767c"; - sha256 = "08pqnal5zfspg1wmg6laf9k46xrh3cg0yzdhl853j3ys96mfk8pf"; + rev = "a679b99cee5f3349a83f95f8200e7c1fe6603b13"; + sha256 = "1jdxh28kirhw1m5gj48skhffn03g49qw92vmr3fahk5dfqh4cyi5"; }; meta.homepage = "https://github.com/asheq/close-buffers.vim/"; }; cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-06-11"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "09bd61415ecdba84f378fe734680f69375260985"; - sha256 = "1ygqn0qwmgq19c46aadrqb7kysmwh5igrdj5jwy79zc6f20zh3b7"; + rev = "4be3c229fe932043fd83ad52fdf0ba9af7297789"; + sha256 = "12cyls7vsz852b2x8vhs7qwi20kcml4z7zc5b6zaamw2h74an6sm"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1723,12 +1735,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-03-03"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "3dab73d34a889eafdb57c666c3c2076b4c3e126b"; - sha256 = "08nyng2ykxnapih97m1wsj1fskjz7yb09g2mb3428l7zbvjjk3nq"; + rev = "e6e3ec979b586a75c53e72f2d6a035f28bb3979c"; + sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2291,12 +2303,24 @@ final: prev: src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "625a5cf79443a532c81f9290b3344ed8f91d2e20"; - sha256 = "1i2l9ss9i39zdxmfzrpvwsp6lx49ly7synrr2bm6byywmpx1cp37"; + rev = "7a01ffb1e6538fe634f294908a50a7b680039284"; + sha256 = "196a66my0jy4166irhwg908dayqc2pv0yiwqgsisi8srzybacm6f"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; + codesnap-nvim = buildVimPlugin { + pname = "codesnap.nvim"; + version = "2024-05-08"; + src = fetchFromGitHub { + owner = "mistricky"; + repo = "codesnap.nvim"; + rev = "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b"; + sha256 = "1j1qw9wr2ymwj75k3yhby2fcq81b68yxp4wvd16xnq3ivyg74r3l"; + }; + meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + }; + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2024-06-05"; @@ -2467,12 +2491,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-14"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "520ca6e0bd924e3ca8bd26e036a3b830955cf52f"; - sha256 = "18086w0hawhf94xzbgrk2h5qsnxx58w9193v5ldwmx55l7dn9i16"; + rev = "4ad0395994f374e6c797266ea4acca90927f19aa"; + sha256 = "1fj2n5p335as4cdrn0msi8a4dmzwdcplwlka8hra2p1avrnv8lw7"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2551,12 +2575,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "bde3bee1773c96212b6c49f009e05174f932c23a"; - sha256 = "083a6glk20zj1rxnajchi6v6mah9632qmbzrs270lmjplk6dc2qk"; + rev = "cd75be867f2331b22905f47d28c0c270a69466aa"; + sha256 = "0lck0dzrisb3p4gw1qfyh4874nfj74ariw274s6nzqz39bk8nmqq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,12 +2588,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-05-31"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "934687860a71d1d03e569ce11f880a4d404e69aa"; - sha256 = "1j0rsyw37wc0sh3im1m20akriyj0fmwlhbwfpkzav25wk9c8kmf2"; + rev = "a81977726f726b21d4bd75cea5bbbb7022005507"; + sha256 = "154bkh2cxar7ajyi8y4ym6ckp48b333cml73a52g6qfiggql5r33"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2624,12 +2648,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-14"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "88d08cf54f623341adde4b18362bffc95174dcd5"; - sha256 = "1ih8f8bbivywlaj54jaxnz6i05770qss028fafqsvn3h9cindigi"; + rev = "0668308e68b0ac28b332b204b469fbe04601536a"; + sha256 = "0vhcdzhrkh3rs88kh481310z9ma775za1gf7nf8fq1x0znd2455w"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2672,12 +2696,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-11"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "83808cfdebca290c84808c85b73f4dbcf5cf981f"; - sha256 = "17l52gd96kfqq4nc0z8qprigvzzrbsa1vijx7kdvgr0qbw4mr5gy"; + rev = "6b35465a58052f06b5ee0ca63606439ea7c862e8"; + sha256 = "162xqsrdv9zpqhr723z5b4m1154ryvddbj5kyxsrwccgxj6q5irv"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2720,12 +2744,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "909d233a8a86fd5ca8ef9eb1e404e89b81e05c41"; - sha256 = "1gbksj75hpkxn5mvvqhyhwx9l2b5xrp2vgwplydxgp3ml4f66rv7"; + rev = "c3fd47391de6999f4c939af89494d08443f71916"; + sha256 = "0vw47mbx7pw4zzrj70yli86nk407j05ll1lq7d4nb41vii3lnlyb"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2816,24 +2840,24 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "db76342d8dff74b9382bf1e9c9e648ee16869809"; - sha256 = "1vzhylvw54jsz3fnmbx85if1izkmzzzbpzmdzw6dvmyqiw4axj7i"; + rev = "998e6562cea3f86af74c489eeaf005ae82657886"; + sha256 = "0azwqlw14ipailh6xdlvflzlc6d2r7gn0syba5rs3cd42pdgk01f"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; - version = "2023-07-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "928302ec931caf0dcf21835cca284ccd2b192f7b"; - sha256 = "0chfg23ckqyz5gr44arfvvs2b3h34n3d0jhmhfzaw4ylspxfx548"; + rev = "4bdc04e2540edf90fda2812434c11d19dc04bc8f"; + sha256 = "1ckrf37p22ap1h9ls48jr4qk4yrvf17ylzkjki4dbpzl4kzrylbi"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -2852,12 +2876,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-06-12"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "b88c997f468a1bacb1e9b13ff3b567638caa06e6"; - sha256 = "0q77lzd9ls62dc3fbzrc401aaxah2sh1p1g9zfsxvimb4y313b7c"; + rev = "e6e33b848f0e2fe5c13f6553c568764555c390a3"; + sha256 = "14nhv9jx0f92gp49bymr5wfnsvwkfllsmb8ax9nbvj68i22baq14"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2972,24 +2996,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-06-18"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c6fa7c615ea7209ece65b2322591f0dd0167358d"; - sha256 = "1qxnk06sxrs1i5rhraiid9v6jr2nw5psgj8f0n42jfbpiadb6m2h"; + rev = "09e64956c2946bba0a060d0a0aaddde106753bd9"; + sha256 = "128z109hixhbn50aqgcdihdjc0i94sgqm95l8ra81cskhz1y00cc"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "7fe1a74a1e9abba978e3a1e02f798bf04de71a5f"; - sha256 = "0s61cwhjacnj5rvg87l263pf8rrla6ym8z89pp43wqj875d8d8s5"; + rev = "dc1efcf37e8c415ca686a4b6faaeae801ffc7ab4"; + sha256 = "1pvqxbyiccq5y9m0v23prkfi5b5p09xbn6ygckv7ppi7gb63hr2k"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3262,12 +3286,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2024-05-18"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "7af2daaaf933b0617ded0f78b49f4d5fc45f9f64"; - sha256 = "131h6qpnzdgq72z4wkf3pm1xm848iyhbkim3689l0x950z1f56n1"; + rev = "750f802879c90ea51f92b68c35fa562ee575804a"; + sha256 = "0zcg3lyxjib9323dwilplgycxx0gcakfncficf3niw76j7zqgw9c"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3394,12 +3418,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2153187e3ca56c11a7f35852bbaef6525c936b1c"; - sha256 = "17bjyn241iy7qflw8yqlzxi4536b9l6hnxcbgbxsj8a7s3f51iqd"; + rev = "95d2ccf1a962445eec8640a507b97ed10d7d865b"; + sha256 = "1islv5bd1x3s7l6x0gigi3xj9k28dz18riaakjhm0sl4p70hxc3v"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3552,12 +3576,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-06-02"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "9dbd4d1c3255ed801e515f2ed388f4c6ceb62f6e"; - sha256 = "1ccawa3m5crqgwz30bm6pz6rdjdnqkp6w724qrbq5d053gss42jq"; + rev = "752a026157f5befaf705bccbcb2ddb5b67703e03"; + sha256 = "0715aaryz76dl9sqsfd8kyz7nwk0g803h6pxnnhlxzpigq9fcs8m"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3720,12 +3744,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-06-06"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001"; - sha256 = "1prrmc41221f334b1cxhc7msxz5a83m0k7hg2hzspszggfgv49vh"; + rev = "c6e37476ab3b58cf01ababfe80ec9335798e70e5"; + sha256 = "0mcfm4ya7kwr6yj0wfwylqqhiv9hx7m45dpfsra7zzjs2xjpcplq"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3841,12 +3865,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-05-19"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "990a1349c29f7d474a0cd51355aba773ccc9deea"; - sha256 = "1qn6b6hmyscxiczwp1k530l1k165wlnqxjk820737d27l451c5vm"; + rev = "5aa227fa083fd740184b55b5220dfabc24a25cc7"; + sha256 = "0ga9ipycmklxcbqz8pnan1sli49qwc8wx034drmrvfpbriw3bc73"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3997,12 +4021,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-06-19"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "c56717d6833166adadd11cad05d979b1fb370c57"; - sha256 = "17cwiv25qg3lvlm6j5v95pdxd92470kb1495xvp2iaanzzmkl1h8"; + rev = "3b91c1a471160bd8620bdca8f18743d954994daa"; + sha256 = "1qapr7nhp8kz9dzkzkkqzlsv51qdkdv5zr457pgnf7rpk3bnf4yj"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4105,12 +4129,12 @@ final: prev: git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2024-06-03"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "bfd9fe6fba9a161fc199771d85996236a0d0faad"; - sha256 = "1lwxnfa6scw64pxq1viqrbdcsn2gf8hysqkbnn66y5518b5rc5z4"; + rev = "45cde6f0acf26d0e4b64acfa45349dd1da01e577"; + sha256 = "10gsqny5wbqyz7grvnn4c02wib06b4594rffa8bmdydvg09fb9j9"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -4189,12 +4213,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-19"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "651d5ed082605f3ed96b0f037a768ca06ecf8fc3"; - sha256 = "0fllibgmp1sfargpkswg1h3kg667y0sdazc0z5midaq8skr9crz6"; + rev = "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7"; + sha256 = "1xaxi3v67wdrgyclcrimcpfd1ggfb0wxxy2iz9xmqlkvc3g3aws1"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4249,12 +4273,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-06-19"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "78c6d7b970a79c34dc0f35149f4bd845e09803d6"; - sha256 = "0pg14jml1n27imy4rdb1ri7wi7bnh2fp8q7rah5az8k80g26ghpg"; + rev = "cde0c7a110c0f65b9e4e6baf342654268efff371"; + sha256 = "0xmyy4wahgi097ay7bs091q9d7ysvknargnlcg8l7qsq6wipl4d9"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4297,12 +4321,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2024-04-05"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "3552fad4a0244ffd9ac86508e29ccc5166f19eb8"; - sha256 = "1a7dbzr3sgabcidwls7mnjbdbhjqayh1xfxwhl96ml3cqhari2k7"; + rev = "1519ea3512828c944eed5b2bbb66a8f8deb92447"; + sha256 = "1ql68yzm33jqjh2argad8zgl012sg4s7xzidazmrhl4ins6y492g"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -4405,12 +4429,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "905a41c86dbfed42f89c13c36f0e3407e9318910"; - sha256 = "150lr7imib2wk3pjlp6jx0w2vz005q89f7r0vnvpw1gh2f6rjl5q"; + rev = "23371661bac2b7fdd9769c685e4224990c3b9ab8"; + sha256 = "0f0kpwzl614zwbrc6rc8x5cl54dhdlngg41xr19wzcklnqzbl0w1"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4429,24 +4453,24 @@ final: prev: gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-06-05"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d4cde3853a172485961b515c36d51d757728d6e6"; - sha256 = "0aqz3gybdl1sj92p53md63pwgfs1d60k8vjc0x69wqya81dl7cn3"; + rev = "fa8138d25c061b9cbfacdd3f4dd1929e2a6d92ce"; + sha256 = "007i6gkbapyn2fv19yr5izfsv859qw4qnbdxfp7kv0sidkqdk47p"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-06-06"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "c1651e33a450279b76e6aa70d131472201ef930d"; - sha256 = "1axnx1wa32mh5s2vzhhc5y1471053y5ml9gnvmiiqax94m7acvzp"; + rev = "de6587e99371aeb92cfda3415b6a696c1f55d397"; + sha256 = "0fqynfal7vk55mh13p5v5gh3fhpf26a7kajyrl79hdsr9shv5s4g"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; @@ -4501,12 +4525,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-06-14"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9d5b241261904ae22429877c1459e7c632dba736"; - sha256 = "1xb93g4cxy3w4jjagaqmyvf2qfii4fm5biriadkmf4a08vdxg682"; + rev = "9688bc77bf9e8e2ad97cf0f9b7701407aa2b31c2"; + sha256 = "1paddg7v3akc4s2l1br4gfwvbg1gxzgajaqman3fi56pl7lw5xy1"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4548,36 +4572,36 @@ final: prev: haskell-scope-highlighting-nvim = buildVimPlugin { pname = "haskell-scope-highlighting.nvim"; - version = "2024-05-23"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "kiyoon"; repo = "haskell-scope-highlighting.nvim"; - rev = "8d882e6710865217394cf1cad5fc9e2becd6d6f6"; - sha256 = "1a7mnb8a0a4v3gyw7padwbqchxmjnygbvvr5m2cixlmb01ahs9ap"; + rev = "9f0f9ee26a011c3567865cdcc0443318de281ad3"; + sha256 = "1npaanvvgnqpra4wbnxjffjdvw3mks8si42pnl5pj5snascbigv5"; }; meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/"; }; haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-05-20"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "46462fe142521bd5719412dc9d740c2e54a9186e"; - sha256 = "14cqvs09yk1b9dk8k0l322kxqahr5hzv7iiz72pjfjjk888dhdr2"; + rev = "e430927cb222718e14ac32116011b5e3df39ab51"; + sha256 = "1drsis1521x31r389j9d2gxcclbc9cfg6f0w3qgbz7yd4cyxmxnm"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-06-16"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "0223bf4b47ab517030f406617c153e7d1e4a7811"; - sha256 = "1ab3s6lrqh870qcphxjsvj5q8jg7lxv27119r5qyp60rf657q39a"; + rev = "239875d842ca25d4eb7dccac574ab9a5f5271c34"; + sha256 = "1w5m248lg7c3hnm4mdrchkhxr5ack76x3dp3p4m1vgix9gl8hbl9"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4859,12 +4883,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-16"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "bdd5506be7fb39668692e30141f1637b691379af"; - sha256 = "0dfvg393l0rwr8lm25fkw8gh1vx592jc1ccslal81jvyjnvgc237"; + rev = "7d021c94e231d491355f5e724ba357ace296f06d"; + sha256 = "1fjh1w07lwngyxa7aqxbxw6x0npz6x1zb7k73q8zihrkz0xrhcln"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4943,12 +4967,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-05-23"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "d98f537c3492e87b6dc6c2e3f66ac517528f406f"; - sha256 = "0zb52msar7hl38xmi3pvjsynjabqyv2rsajrzdx46wqp018v971b"; + rev = "65e20ab94a26d0e14acac5049b8641336819dfc7"; + sha256 = "14v9mglm2zykylga0lzh9w1vcmxixya7xg2k4z4m6f4a3l21farx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5136,12 +5160,12 @@ final: prev: jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2020-06-18"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "51b8a2a504416c4959127c82eac26f14f3508975"; - sha256 = "15ax7v6crdzra4sqqmjpvl9q1p9dmsksrs4j68zqqrj6kka0zkgn"; + rev = "ca97dafc82c012b3a9005a12a673d2cfa854376d"; + sha256 = "14g85r90860a4n7ggh29s1k6brgcyycm4j1ll4y7h872v8d5265p"; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; @@ -5209,12 +5233,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-06-12"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2"; - sha256 = "1ip8f9i822d6mmaxvzrvap19k5lr9mp8k6lgh2xyspszbgxi0nhg"; + rev = "e5f7b8a804360f0a48e40d0083a97193ee4fcc87"; + sha256 = "1066495w73a11kdpm8iah3k0pjf766ylf21jk8gjid73byl2lz0n"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5317,36 +5341,36 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-05-01"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "17deb64279389056b6edd4b0619d8dc391798b6a"; - sha256 = "0lzihyajpjmj8g0jqbm5mgdkafbpc061bwjrsryswvgan1j5y5bv"; + rev = "3ce514080931ca6c35036dd9f90da879e9ab3204"; + sha256 = "1jfkvhlr70d8c6m413r74q4qi1kwk9ll5n48scrqk4fvpsgx8777"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-06-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "bc620783663ab09d16bff9fdecc07da65b2a1528"; - sha256 = "180rvpy9bv7c7gnimhwgzyxr2hml9v371ki8n73v726ssk4x1pzc"; + rev = "d0921f5b9b3d2c5e09618da55a018228edcc4d16"; + sha256 = "1yl852zim52mrj4ddc30pfgyrp58wjkfcvmiyncqgj1nsibhdnxz"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-06-15"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "6184ebbbc8045d70077659b7d30c705a588dc62f"; - sha256 = "1kj3p5x7h8k1xp8m5pxjkzbfigcbrschgm1kzlc3qkv0py3i5k5h"; + rev = "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8"; + sha256 = "04qdq0wz0qz0p2khm6jdzxy70pdya9dfjc9ij4liphxjc3pf0c9y"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5365,12 +5389,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-06-10"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "3c0b48374146abd651da5623f3f73f96121a616f"; - sha256 = "145hpcg64pxxfqhryzs88q0yyw163a892npsra6rbdnca1jzlr8z"; + rev = "a46a28499bae49f5f0e99d04134ba4617a213304"; + sha256 = "00621vmbyvrgqpwlshmndnmflggb9jhislqqlmps8amqryq57y5w"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5401,24 +5425,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-18"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "2ec33f2a38974fe6997c42c5ce61ce84eab84cc8"; - sha256 = "0xavag2c5mq5ii14b5dvm7nm13cs97nhag28gpvjdzwgkzz3c21v"; + rev = "eca8108dcd5f41fbde2a674dceb58b81ed887dc8"; + sha256 = "02sgp1lv4s7szqw2awsaavlhvji8jn24g8hzj7d56y6hjl6pz1id"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-14"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "89e0d00c5aed623c1f29cf2a963fd1737358e92a"; - sha256 = "0i4xh66xydssvr4n2kknrg1qibj8ikfvy5m6ljbmhbvgxim74y48"; + rev = "847af406e688e172934ec91ba12088ffcd497e1f"; + sha256 = "1grp39x69i6yqmcflnwxj74knsv5pdxfa096sxn7h458nbdm3pma"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5473,12 +5497,12 @@ final: prev: lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "2024-02-08"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "4899ead266d99e0b9749b9e44f6a33ea83384a7d"; - sha256 = "0bg8p4g0v3y7sikcwb1g2n3kr4rcafskg1if6gh1xnr1g0czbckw"; + rev = "e7852490097ed1bb2ea95fb08fd0fdc4d2a7ef20"; + sha256 = "1gg5hxss85bcsjrfqamiir571c8xqs03rqaiigfhbs7lhp2l7ffd"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; @@ -5725,12 +5749,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-05-26"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "78f4cf53ff72a234d7903c1d41872c8b21c6007b"; - sha256 = "03791qzm3qv2gw176bwki4dmizjy3myzdm2c62y4hjafx4y9mn8d"; + rev = "93e11c9a01f81daa4a5644e772a7a77f53dc270f"; + sha256 = "1765fwsqxa8w6rznrhhrmxbxk8mhwxh540sllj9rfkx1nh5lszg9"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5761,12 +5785,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-05-26"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08"; - sha256 = "1z39f3qagyhrm90hz4pilbqnbyncpxgzsx236yw9mdgfqni912ms"; + rev = "87701af045b3032515776abeb47eb8c2ddb5e679"; + sha256 = "0ik2q2jz4ldyql3z64zr5dyi8i6qja6xsczv966fkdmsckk7r1zh"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5880,12 +5904,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-06-07"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "50fcf17db7c75af80e6b6109acfbfb4504768780"; - sha256 = "0aa5imzbfz50d7vpmxixqjri147x7w7883p8qm6dp2m1ygijrx30"; + rev = "ce0a05ab4e2839e1c48d072c5236cce846a387bc"; + sha256 = "17q4b9hlnj7cnijw8xcn0g3fk8q3c8smz6l125hlwzlak23b716d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5929,12 +5953,12 @@ final: prev: lz-n = buildNeovimPlugin { pname = "lz.n"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lz.n"; - rev = "ed1dfca4c69ad84558bace90740b3ea2dd6ac842"; - sha256 = "122rx7khasj0liwrw07m4x7ysq86342b3q5fzg0gdkln7nn5pv4n"; + rev = "4c790ba2c3789f580aa019712bbe3112f85e73a0"; + sha256 = "0vwpfagpm7vik1cg4cwx0r00fqvbq2id8b78wzrr090xp2a2cz50"; }; meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; }; @@ -5977,12 +6001,12 @@ final: prev: markdown-nvim = buildVimPlugin { pname = "markdown.nvim"; - version = "2024-06-10"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "tadmccorkle"; repo = "markdown.nvim"; - rev = "d6dd17dd36fd8d83f5bf2fef6a9acc24ffa6ff9c"; - sha256 = "1i6ays4c4azx7fvfy4hm69psmafyvqf7q33a8692cj6q8zl5fvxd"; + rev = "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2"; + sha256 = "0p454caxkd8chg0v1m085vlmrmhkvhfwq625wgy9s8bzinja5rb0"; }; meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/"; }; @@ -6061,12 +6085,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-06-15"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "173bde5eea25e73c5ece9448e19c3e30b5b21ae1"; - sha256 = "0smlnk3d5dv33ww1k96f7mbyy6xs3ma179f86kifv08k1wn7n4xq"; + rev = "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4"; + sha256 = "1vlv9n8hy7lcjz3xa48pry9by41pfjv73vyjinyj91bjs7x4ln7p"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6109,12 +6133,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-05-29"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "b76b906cd6ed3c3152a47924a8eb5dcb35b326d8"; - sha256 = "0xy98wlbdljcf08wzl4hndwadmswb3a4jmf0ynnrrkczg73pbq2b"; + rev = "f626d41b9110e6ab853538d8b939979a0f1adfeb"; + sha256 = "19xak308004015avjarqdrmwwwfkyam72kjav7g7v8pg27rqckzr"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -6157,12 +6181,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-06-14"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ebc8cb0c1f73ee6c53e0560957a37a2307a70f98"; - sha256 = "0jvrqs9fmn8m1h5wdnl981dpjyp4w9b5q09ypblg6dp1f817c0nf"; + rev = "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2"; + sha256 = "0mwgyr0x21pp788k7020bb5hyj755vs7m72c7m0bh09c4f3z7aj9"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6193,12 +6217,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-14"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "e6179d25f7e696baa612aa35b951b5ca3f3e75b6"; - sha256 = "02mvgvdrq9p80gcgh668qajgc32pxhn5aahw0gkc40mc4f10lzlm"; + rev = "8065d69e73a2623203138bca9dc436df7784ef11"; + sha256 = "0gxzl1ly9cw9lqpxrrk4k28blrq4a7vcl7jl279zm981yvpbnba5"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6253,12 +6277,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-06-01"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "47b9a56d4bc0f877ff9469910b9653c46d462db4"; - sha256 = "09sarlw6zniph9kajvmfvxy3sjn5r7g02i4dncv9q3ybasjgqya7"; + rev = "1a5360c59dc68230aac867fe262e4efc53f1b2d9"; + sha256 = "1ns9lq4bj8s2amwkj4kil3h3lkhgsf7wvyf3w9m6419svlxvzh7h"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6301,12 +6325,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-04-12"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b959ad0f38881e81e757208c6adfc9e6dc24dfc7"; - sha256 = "0x4v0bpahwqcrwqv5nc0hnfc0qyc21sgd996h5nksnxykrxvf462"; + rev = "782820896b1691ed664e4c24f1cd9793dcb33dfb"; + sha256 = "171aysqsyapw434xkibxv69p5fkwha4addkqfdssdm0wq9n9cm4q"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6589,12 +6613,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "60f6dd6aa1006fa5c3ff4b7bf01586dcecbe9187"; - sha256 = "03hz05kpzrbwy2d9pdmi2yihg7svsh876fv3kk0276v9276hwi1s"; + rev = "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776"; + sha256 = "0x6i732x7jxjry09fk2shn39winxgl58pjwd06v6incy1p33a9dk"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6661,12 +6685,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-06-17"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "11dea1b67bb153cd5b4a2de348ceefa69508dfce"; - sha256 = "07d8kmn19hngl06ak2ch7p0mfjwlgyim0xkjfmnsdhxd0ksqdn49"; + rev = "e1bcfc87f3566fc43b875cc714ea348c8f88931a"; + sha256 = "1rvai4z77rv6i1p1iyy49mwl7l067a295izf3wflfkq15mhq2k8b"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6733,12 +6757,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-06-13"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ebf75f57fa8dadd8747a678724b273b398143dc4"; - sha256 = "05zq8q88z14hd9y9ywp09kxjxpxfzb72yjm3gl7px8xxh18nqrds"; + rev = "99b32492b836b64a5ff4544d4c466496f0aec9bd"; + sha256 = "0hjbllib07aqzb531fb9lflid3p09ny9bii8ds4fnpvkbic2wl48"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6805,12 +6829,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-06-09"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "f30bab1faef13d47f3905e065215c96a42d075ad"; - sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; + rev = "26ed90509c377d10dbdebd25b7094a886323b32b"; + sha256 = "1b0pw875qnisxxraxwwsb4r6b6234a3na1vhs6r1hz6h5xrxzqmf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6866,12 +6890,12 @@ final: prev: neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-11-26"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "3117ca5442c02998847131c39551b76a6ceac9d7"; - sha256 = "1apbn6awihmjxqj465h0aik6nhd2lh00k7vbpl3mrrh9pxifyglr"; + rev = "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c"; + sha256 = "08pxv39pc9w94pqf86i7r835zlvd584l5j7jznq1nf1yc1ms25ip"; fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; @@ -6928,24 +6952,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-06-16"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0481d2c79564d6658caa1a4962bdfba3a608b5d1"; - sha256 = "142j5s3fcyggkrx92w8k6d3vas2m7580k9vd6ca913adby5ys2cn"; + rev = "f5614c9cf7a056f791565183f216401b28438818"; + sha256 = "0jli4pp124ils5kxrzdba7w49jsw823rqvkjib382xa2mp5n9f3i"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "7b9e0419bd92f641f730e31a4236074e53a5ac99"; - sha256 = "1f9a0aa4q6c4armj9fjmbkpk2j2svgiyf1mlmq46g0mqcmhnnbbh"; + rev = "ce8b10e4e4f670b6f79224139053679864fa810b"; + sha256 = "1hbfdv8aw4bv8a69jscr7kynd0ik0506546qsvd39mh7mr257mc1"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7084,12 +7108,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-04-17"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "6965a714793d9d156dadbe734c99b3a307f65c61"; - sha256 = "0dxcnkvhdlxlxa6vrjfgn5pfi3a2g78c3xz13sxggw559wmzp9lr"; + rev = "353364aa05b94b09409cbef21b79c97c5564e2ce"; + sha256 = "1sv5i68pc24zl1gbqa94gy5wccaii2glx0bgkincpyhfycf2ydz0"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -7108,12 +7132,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-06-08"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "123dda90019215646700bfec70f178ad95820545"; - sha256 = "0g0nyasr7df7wsbfkcvkpwxyhsl93iq35q46fick8iq3mdf0mjl4"; + rev = "d64a8b7e8730095ff634e6586584e8543043e986"; + sha256 = "0ikam4lmbi1541sy8sqbc4psblhizf40mspnwcag6q4w7g5pswh4"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7228,12 +7252,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-05-30"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "7614d666eaea1674dc96184e0e3c1a8bc2c4a3b2"; - sha256 = "1wz7fwcycz6xwwnw0nqsgkxz4dgmabz8rr6574yvbvyjg3blr7s0"; + rev = "9f8fb93c70e9d759d849b45859f017b348618299"; + sha256 = "03bhns205gd4hwwzcs094fczxwf9bzixn15lixw257579s1bh6hn"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7252,12 +7276,12 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-05-28"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "9e95ff4bb6fa0e7dfd40472b9dde19fd0b75aa0e"; - sha256 = "1bps5cp7ahnhw7z6yrpv9fyxj7jlgxmzfjk949lrw3ryz6kgzry8"; + rev = "131641a516085c5b3cacc8022581902e9f2f14af"; + sha256 = "1ni6213wixgfbg8cq2w4p0nfl5rhmrwvxhyifmvwf4x37lkhsx4l"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; @@ -7312,12 +7336,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-19"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "4c068cf7a74d77cc405aedda875f3174f7eb9143"; - sha256 = "1q5wrryf5xp13lljjgm95aavn4s2cq0p52pbxcxykm97vm1zi9n7"; + rev = "6994cf0476f1d834fb9d0b5f454b7efe650e1d24"; + sha256 = "1j16ih24yypqcsd1grd5ymczzkqd26lppdl2989mc3wwycvbvdz2"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7348,12 +7372,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-05-26"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "741ad26c4acc45f2164a3933f7825b0e555b724d"; - sha256 = "04yfraal84zin7gvhfrx9v5359m3s3gvrxydw7xp5rz2rvsraqn3"; + rev = "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e"; + sha256 = "1rxj6sq1v0j0q4cj4js2xb3c36m38xgiqsr6bgyc6ri7xz8zxayx"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7372,24 +7396,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-18"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "88ac36864b5976a64b14a8f156c616f41b32f228"; - sha256 = "0qkm5g6mfaydgbsgkkng79j3zm0nfbnim30ibjpgby74fjpmzp09"; + rev = "03c6a75661e68012e30b0ed81f050358b1e2233c"; + sha256 = "0164qmf3kw0nml1sy32yl0lzkbi4g9j3vvpb1lwh8hjz7nvhpp8k"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-14"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "cc0a3c45047e3daf85d07c1571d65476cfce6480"; - sha256 = "1aa2dcrrwmbh8dh8vccwz2jdwyfsy10jagvqbpmh7ax1mnmphnqv"; + rev = "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91"; + sha256 = "0975xwpagsjbl1ahkdma12fppjg7k5ami0mzjynzig000f024pq9"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7444,12 +7468,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-05"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "322978c734866996274467de084a95e4f9b5e0b1"; - sha256 = "1l1gzpza26pybg6fcjif5ypqmxl490wv82my13bwkc1v83a5x4xm"; + rev = "61574ce6e60c815b0a0c4b5655b8486ba58089a1"; + sha256 = "1vllq6lkk7karc3n8h9wj2ax6sc99h26r96h18lbvi0nsy98ss53"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7480,12 +7504,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-06-06"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "164e8cc7fcb9006a1edd4ddfc98bf8c7f4fe2e0d"; - sha256 = "1qk0m5z5jqv875q96mavmbnpd8570d9xzr928izj807660r3b0p3"; + rev = "7b73d1111cfb41f980d25c800d86d43ad802d8b8"; + sha256 = "05llkd2l1jwcjw7cd573b2dr03zb6dgwjf6xf0a5qrj6vh9chgay"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7744,12 +7768,12 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-06-03"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad"; - sha256 = "1g0gn0rpdmypjay0dwd9iw64qvm63g78ig839ys4z2mnwqx6vsx2"; + rev = "d777c2b32ed39f61209c09bede28d7491621a631"; + sha256 = "1fsfnir1af847hmxgc6ca3hxqpnik9dv1s7ag28kzmvy0wj8clav"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7768,12 +7792,12 @@ final: prev: nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-05-22"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "d7c695ea39542f6da94ee4d66176f5d660ab0a77"; - sha256 = "1hqnwq2hy7qn62qxp204c9mx6japjhd6q8sfac0kfvzgw49v3khi"; + rev = "484995d573c0f0563f6a66ebdd6c67b649489615"; + sha256 = "0p889jkyia04l4nhndmg4yl88mc10hf0fzgyyqj08ybzws5z9zgr"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7852,12 +7876,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-06-19"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "6077a6376f9a15eaf3d60a12caca57adb59028b5"; - sha256 = "1lm9mjjqwgf4cqgh4xkq9kfbx9bjz6p68dfimixm3rlsvrxz2wai"; + rev = "07ea6edb98b63cb625ab4230d0479b5ccb20ebb9"; + sha256 = "049hibr0q6if429908v49gxijwpxghjph0981n70dzn2vk0ddkz0"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7876,12 +7900,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-06-05"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "30f305d57d658615cd827146f5e56db8b6833475"; - sha256 = "0znm5am5xpz1i88fz0q6pjnvm5d41rban8wxkrxm5cyjxx1nrb3m"; + rev = "a8f6952cb1ff7bde864a34c502f1a42c360a6662"; + sha256 = "1ib95qqgk0vvn9yfag8sh0dxrl4nmxy8q87ikn50ivm7nmf2bl54"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; @@ -8007,12 +8031,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-06-07"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "941fa1220a61797a51f3af9ec6b7d74c8c7367ce"; - sha256 = "152j681hplib3vyizx1lcnkr3d411a4gi743716h759x0g20bmic"; + rev = "efc6fc83f0772283e064c53a8f9fb5645bde0bc0"; + sha256 = "1garyyavgg2xfdkw8s9jjq4p5mv5i6m54m8dszdhvkad5ni1zlvb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8043,12 +8067,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5c33bf1f708ac8cb839469e1a03d45987fec305c"; - sha256 = "1mdqckjmk1hdxgipa2qwncwmbv6ad8mi5cqisinkz7610k55sxpm"; + rev = "cf97d2485fc3f6d4df1b79a3ea183e24c272215e"; + sha256 = "1vs6cwa07a18p1c8q4z8gfqp7iki4qwdk10ahyv4sfgk0s1wdk9j"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8307,12 +8331,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-06-13"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "fd334e5ad0c616987d1b9114890a59c97165cf83"; - sha256 = "1s8dr79mnqw2ii54myi43fy3knd2i28c2k5g59fln2m8g90j21lg"; + rev = "965f10569d033c4e704327ef9a22d306ac20847a"; + sha256 = "0zc5dd65bcm85nwvlc9vpfzn0n7pn1xl80lm2f76nn1s4hzzxzzf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8379,12 +8403,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-06-04"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ec67d4b5370094b923dfcf6b09b39142f2964861"; - sha256 = "0b99x2cc18bny35l2njlfd6cv9ynxhbmlkbpkg2ikp0k3138jga3"; + rev = "49fae98ef2bfa8342522b337892992e3495065d5"; + sha256 = "027jfxxmccfjyn2g9pzsyrx9ls9lg8fg28rac8bqrwa95v5z5dgn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -8403,12 +8427,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-06-09"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "b36bf49d097a09781ad6ac0cfea28b40b74570a3"; - sha256 = "1z2drdxrs058xdjdr8khf1gm7l7pmvvysxp9ynp54dz5wlvspbxv"; + rev = "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f"; + sha256 = "1d5ffrsl1ryiq8nzxx7k69gpin6zs2ys4zc5pg47qcpazx7my8qc"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8451,36 +8475,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-06-09"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "2086e564c4d23fea714e8a6d63b881e551af2f41"; - sha256 = "0scmn05y9ya1lwz7ad7519bq1n3ha8hs7i28kgw83r5syp0bg8zc"; + rev = "8b2c5c678be4b49dff6a2df794877000113fd77b"; + sha256 = "160sk29hg0xqg02q26gi27h9si9ara4ljazqrd280igvh32xpyj5"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-06-19"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "66ae8748fd4e8550c8b17cf115c9739aea1e4067"; - sha256 = "0hll69cjhgjnbyh6xqvk9xk6pr8fna9h1rj4nz3fkmq57iwzs812"; + rev = "6cd4ce6cab184e8787f164a182954534221f2af2"; + sha256 = "04r0gd33fkxchhnd2cdfln6g0zqn8nkad1ik5f4v06k6mk3fy729"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-06-02"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5efba33af0f39942e426340da7bc15d7dec16474"; - sha256 = "0dbw3d3d30yg79vp7008yi93n9y258imvr1baydpni571z8yinl6"; + rev = "cc908326c93473041d44398d5ebfa2bb4169d649"; + sha256 = "0gy1d7wmqvij8g5xrh5w1w5mr74sz0f4x704526wf8a40b7hpqz8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8535,36 +8559,36 @@ final: prev: nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2024-05-12"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "1428108f18ce9d8cc4481dcedebeeb490eabf395"; - sha256 = "1m73vkz8cg8qqzh9aavprhg9vpzl1sw88aq6h8sb853lgw5aa5wn"; + rev = "a8d2844bba925d9450ef7ab215f3b054028288ca"; + sha256 = "063xfbmwzrazvi21s1b01lqzyq67m7r8pnr3wyrdsxl2x8rcvjkx"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-06-11"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "06fe07d7523ba8c755fac7c913fceba43b1720ee"; - sha256 = "1k23jy33abcxc84qgkw68mzbcl8fxpvg8p5phh5pgvp5n32aspbz"; + rev = "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1"; + sha256 = "0nyrbgr0dl85i6ycyjlrzihfqz5g2s7arndhd6vlgf5xg2yj0gdy"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-05-22"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "cb064386e667def1d241317deed9fd1b38f0dc2e"; - sha256 = "13xyrzp9gfbnrxp6v7xxpiwyk18rnw5pn3vw01f0xvnpfsqfz3w4"; + rev = "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe"; + sha256 = "163nj4y192ik63a4c3d8z6qpxyic6xflifm5nnhq0plzws4hqnc1"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -8679,12 +8703,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-17"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "7e087da48bd88fb3a6c6229a97713ac35694337a"; - sha256 = "1dgqm7qjnkgz9wm8fv5j6q2f46ip9hac1csbwxv7lqavi1xw9p0l"; + rev = "e170641143704068233ba1d301e75684b67fc07c"; + sha256 = "06z445zphqz7icz65gajpj17c4g133kivnv59jw73d31rvja3jzj"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8715,24 +8739,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-15"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1f0029d5283443bad9a818fd7d9db253404bf8aa"; - sha256 = "1il6jy83d56lxlgxyklvl76dxk7iikq2941jl6ihbf0v5lbig472"; + rev = "7731ca4e31b32c176a383642ffcd7d593ac17774"; + sha256 = "1gfwplw9zfxlx04b9sa0ljya1900qkdd992sn771ifnmkc4zhl6f"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-06-16"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "64a3a555b40d96faae488ed6cf5d0f8b38520891"; - sha256 = "1wmg72r6ydmrgiy4c8jv8fpgkf2wwxpyq7zv4a2bx4imhly4zccx"; + rev = "b15e4c1e647b9ddbb75a31caeb720b3b3ce4db54"; + sha256 = "1aw3ddn2cg9h0z5cxmvpyjs29crhr4sb1yfs0481m0sprfqi6ywj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8764,12 +8788,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; - version = "2024-05-22"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "f872cfa38b30a34e179fb028f68588d09bd44114"; - sha256 = "1xlnfr9vdvxhz09njz2lgyiww10fcg79vzm372zqw99dcqr9jm4p"; + rev = "aad7bf06b4ca0de816b919d475a75b30f5f62b61"; + sha256 = "0bjsraykq6xjzydrki7fwm3yxfvkqd46qqc0vv3yvy9hdxll4miz"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -8824,12 +8848,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-06-08"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "308527d45efb9f2a0bd4b4004c1c02023557ed6b"; - sha256 = "0s0wm06ymagrax1lngz81p7bhk2f9k2ivxy6vx2a7fwam8yayrfs"; + rev = "69256ee61f29727760c3d28020baf1e7b951fa12"; + sha256 = "1xy3kz5ng0lnygvgw4wb6rs40hn7j217pfv5qsdkl89jrlq9cjsf"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8908,12 +8932,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-06-14"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "cc51c1914e3f0bf20bd543a7176df5bab12ec247"; - sha256 = "1pr5fh2pr3awmxvaw0n811165nf9p3n0pp2cg4f8qs15y6ncbkq7"; + rev = "7a256b5a87e8c81a034661e9904c739f89961323"; + sha256 = "096ya9zqqhdpg25xwvdn05zw0q40nk27byprfr0bq1g6q71x3535"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8932,12 +8956,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-06-09"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "cbb1be0586eae18cbea38ada46af428d2bebf81a"; - sha256 = "085lx5z7abbn7rq23pma5xmymzgjajp0slg0g42wafxpn7rby9kv"; + rev = "e8787988f2f51dc4678aa13c4553613fff0132b5"; + sha256 = "0a967hspxg2r8rzj02m8l0n8b6y47gg9p56jm9m5z9jgzn6s5039"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -8956,12 +8980,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-06-14"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "d78fa84c06d37b1eb3bd42b4b5467c7476e74589"; - sha256 = "130y8gjbyr3bg9l24s0iiiv40wpqq48axzvbjpraalca181zkhcd"; + rev = "8bda5b073de30533e04f61b661cb7c22d7fa4f23"; + sha256 = "03i9lvsr01ml76l1m0dzvbgwk9k25lajmgxazqn5i282s2d6bb35"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9089,12 +9113,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7"; - sha256 = "0gyacxix6m9wpzlm6a5p1s2aa9916750fd8chgkga8m3q34bdq9a"; + rev = "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05"; + sha256 = "1l2a2ilavshxczjwb2rf405zzladsraawby7z1gflw1m3g9qgiq1"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -9173,12 +9197,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-05-10"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "44054d6d2cbcf01a064858faa3364cd30d38057d"; - sha256 = "0kwk96y6cn7l7w151438sdjflfc6c6irysg00b1q4h1f4x3fcfvq"; + rev = "1592944444513c208ab5a087397ba987932af750"; + sha256 = "0j45p1f8kxgmbw8kmcvvyby082vk8dgyb2q7vscsy8zvmqszcm24"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9415,12 +9439,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-03-06"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "67e09027b5d8bd948907734fc6fb15028ffdcd28"; - sha256 = "07p45qmxnc10kfn9syfqv5v5jm75rd8bs9gv90a246dxis4p0515"; + rev = "09fabb62d414e56ee3245c558aaedbdc662b6493"; + sha256 = "005lf0iq0gfkxvknkw727h516kd4ghd5nc9cayxayjlpvr65gnm3"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -9570,12 +9594,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-06-15"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "e6b10b2346bd7e469a5f17099775ad906da153ae"; - sha256 = "1m0ah5f1w18g7y78ra78yczzpdb4giwk9hsig3379f26xz5fknp2"; + rev = "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4"; + sha256 = "1fajahgd20cn75xaz4qq0dhvqr2rqr788l874n9qvk4mq4qqvnj2"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9630,12 +9654,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-10"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "c7944769dc489b9e4bc493e40820c2818eab2569"; - sha256 = "14afbxl60k2197zl8vs4rskb0rs09d00kvnr0zsnvzydv5gf38pn"; + rev = "e7843c55f9df6a9db9f97dac180035c6ff895a90"; + sha256 = "02iksjxamy83zix1gr495bvigvyzpv466wz6529nydhwkv8vjnbd"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9750,12 +9774,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-06-18"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "14a5a4bdf23d1971d1a6386b73b89e57590a5e7d"; - sha256 = "098zlwlrdw5icvns5a7qp4bl2ly1imv2fm3981i9wqdvvvzqmn3k"; + rev = "af4de6a35d128ce71c75a9a7846bf089aea76f50"; + sha256 = "14hxzaxsasrfridhkpsa8wva9ych633n268mlipsmibyq56i5isv"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9991,12 +10015,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-15"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea"; - sha256 = "1pvi03f98f6lys6l3jlra9l95dpavdc9y8ghl91mlwvlglrnwjrk"; + rev = "e186518f9d7eb4b1e43fbbe0c52bf323637194d0"; + sha256 = "01qfr9qiq39qg4d4a3wv2i6i85bwlr77l7h54xfsa3n98h93vlhh"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10075,12 +10099,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a90d437f1f4e48825150065987d175e2a45fa39e"; - sha256 = "0w7y53mdpb7xi26bm9xrhsszxngidcxfpwv7z9h5bdn1x53sb8i2"; + rev = "16fa31a410183ce945e58d834a74f161a2dce5aa"; + sha256 = "0sa82fcibwwp3dvakqd9wa0lkgwgi0hr89ffal2y3c37lslzvm4s"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10582,12 +10606,12 @@ final: prev: tabular = buildVimPlugin { pname = "tabular"; - version = "2019-02-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "godlygeek"; repo = "tabular"; - rev = "339091ac4dd1f17e225fe7d57b48aff55f99b23a"; - sha256 = "0jq91770wsp2waw7pywxjqx59v0vg54gfzirgcd85pg61w22bfla"; + rev = "12437cd1b53488e24936ec4b091c9324cafee311"; + sha256 = "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"; }; meta.homepage = "https://github.com/godlygeek/tabular/"; }; @@ -10751,24 +10775,24 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-19"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "78570e237c8b2494dd74ffe196fbd01d0c9e5460"; - sha256 = "1vsfsi39i8f8x6cbsrq491s54p1gh8fh3a0vjgik7x07a9i21l6h"; + rev = "f3f93253797714aecfb95ef7e25f8ff7693430b9"; + sha256 = "1kmikgn75i93ajbi9v9rdm2v2z4gnsslfq9acy2h7lrzng4z9gav"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2024-03-05"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "9ef21b2e6bb6ebeaf349a0781745549bbb870d27"; - sha256 = "0lvykmaarl5nd3iaphp8jgnxg6cly5p6ignd3i1450rpbdp1w9xg"; + rev = "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b"; + sha256 = "0h741m7rcm5kl0mq9kkzw6za2h53chavpkai1qp433plaxzlyj0q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -10836,12 +10860,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-06-03"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "da337930d3998fad976331155e789f8785543e68"; - sha256 = "0fhic35pnalxnlqnmq4xs4k4gcp7cs8j724chd0i3pvmbixk8b8y"; + rev = "d2c8fee183d6b414128acf376f5c8d3c250ae225"; + sha256 = "1awha1dscjjxf10nha3i8mmmv44m1b99k77ap9p33s4whrmxfd2h"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10932,12 +10956,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2024-05-01"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "95b61c01ea3a4c9e8747731148e905bbcf0ccaee"; - sha256 = "17imd6f1qykxv4wk67ihj7ir07yvcmrr0cqvidv1as3k77riclxb"; + rev = "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a"; + sha256 = "1xz2fccjp1rv7l0xzkczz4z2w32q8slc9lc6rm5219s1hl7k4nam"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -10968,12 +10992,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-05-08"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "242ee15047e3400351982ef162301a898ec5cdda"; - sha256 = "1kdjqi046nr052q9m50814k2df0nnmylgk8lcragc2z8sdnj5f73"; + rev = "3f565ad0c0643d6592b5c3fc44b09b4fb2badc21"; + sha256 = "0xcg0wj45ijkgrpgv6vr4qx2rpbm6v94sdjcwjv3ghh16hh1wc3n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10993,12 +11017,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-06-15"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c392f1b78eaaf870ca584bd698e78076ed301b26"; - sha256 = "14k0z9k0d8krs50filg8d38fkcpxv4gy9lilgfj2wrvssd6c9vqy"; + rev = "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a"; + sha256 = "1ysbn67rlf2p63pp8155198a5v0hv5cn2bbhdjz9r5255y5f19sk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11041,12 +11065,12 @@ final: prev: term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; - version = "2023-12-03"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "e04f69d5828c6e6a4d81c34f75f18762fad50372"; - sha256 = "1kh70ivd6p9f3xsf09iwyy94gvkzprv08ln52sh44n90s1yr4ql4"; + rev = "32e802c6ea08304db6cbbf44e6ca9805b8c2ad51"; + sha256 = "08bawjw45fmv86b81wghczjk3km00fbxc10ia1hg3q05q4ky724w"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -11246,24 +11270,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-05-19"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "fee58a0473fd92b28c34f8f724e4918b15ba30a3"; - sha256 = "1iavy1182n0fwiv6rr6i9lb2kyqbw1fg49fy782nsbmkr25b7kc7"; + rev = "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d"; + sha256 = "12mcsq0dbzhvwq5sq5ijq9cdjxgcr3c72r6zhlgr0pcvarchl7s9"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-06-13"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81c867c5f638597a82c82094dcb90ed42444dabc"; - sha256 = "0bq6yjzv7sza4f2mp5x7bv19pg0mj5j6xh3crz4q20l16f2i3hag"; + rev = "c8177ab6fe216f121cc0c4f59e7f1ce59670ce41"; + sha256 = "00sm68wswk2gc2sgaww6x9klbdiz69sx18a9zm9r2if41ymabyzc"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11355,12 +11379,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-14"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "58a3acfc6d8d819324dab4c87068596319032e64"; - sha256 = "0vs7s7byz80mdww86icvgk7ksvbbgm67afiw8vn19ghf2hr78s8r"; + rev = "e5d0e04121c662ce29190a57dd03655d43c59d44"; + sha256 = "1mqdsy0ainbq7rrr5jf1skw6akyr222krgajawzxbzx696hj46l0"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11439,12 +11463,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2024-06-18"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "3f942ec187523d1d82f813106ceea9be9dac5287"; - sha256 = "0yr8vmfq6rm7xd39jig1k6fjqhzb7pi0x9iy9mv5vvixj4drz21i"; + rev = "5da4d695d66f676eb6ea766b946e86f93baaafe7"; + sha256 = "0pbk9svffxky1yrl7r7dlylj8iqadbs5zn5iz24fglsv1c72ldjk"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11475,12 +11499,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-04-18"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6"; - sha256 = "1l4mq2m8s7kav6hpq6nay4xyy2jvq6jbblyy100yfb9nrzkpggpc"; + rev = "4d18ced62599ffe5b3c0e5e49566d5456121bc02"; + sha256 = "011kbs2fqg2bp8nb17ppgv92x89dlxw5sjn5y303qg13xb7f9s32"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -11535,12 +11559,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-06-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "e354912fe85c39ae0b148562ddf31aa622e24638"; - sha256 = "1k17nkcdx5xlsw2r6izsyh1fjjfa9mj1v77yd00wznibczd9jnkq"; + rev = "a74d4e8cb9cd860ebd79e348f8012f57625e2239"; + sha256 = "0m8dc3lixww9x9zasxf2n6g00jimqx6mzlszmggmawhj52sg76gj"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11631,12 +11655,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-05-04"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "41b6887ff6589228c7d4f213259d8e274b0f9ced"; - sha256 = "01whpq420w2ki00wpiz1dwbddxwzyq485rrw8mxbbsxsgq8plzfw"; + rev = "225c0552f55b443340eaf5505f6bee3b83fad54a"; + sha256 = "1xbiq6n1p8j8sh0yx14nxynsz26rll2ax5hwrcjc6g8ahgj38sz8"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12699,24 +12723,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-05-15"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "5d5ad196fcde223509d7dabbade0148f7884c5e3"; - sha256 = "146zgn6cgzk1m9r09v3sdk3vzaan80jwq1zf0fskxk1c33jg1zpm"; + rev = "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d"; + sha256 = "0v7djs9q69aglh1gpvynbzcvaxf5fk2jh4kx9ssmwlh2070qqk8b"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-05-27"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0dc68d9225a70d42f8645049482e090c1a8dce25"; - sha256 = "1wmx9wrcffik5b73q9g9gdhm4h84h62s5acwz9rxzwf24amdg1y3"; + rev = "2527310098e7458488e61a528614da142aa2dc42"; + sha256 = "15zjqzpap035g29f0rf0yw9017r6aapv8w351ikaivfdp05ypdbr"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12939,12 +12963,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2022-06-25"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "6dd03f87d825bf0a9f8611eb54076c7952d4f15c"; - sha256 = "0car62bg681al01bsf7k783m2927shdl5xjl2jlwry54l44b8hry"; + rev = "c23000a030bf14f721d10c0d74e5f8721ac2f9cd"; + sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -13263,12 +13287,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-06-12"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "64d6cafb9dcbacce18c26d7daf617ebb96b273f3"; - sha256 = "1ddab7xflb08gy168042k8w35z84hdvrbz5kx37v96skayq30rni"; + rev = "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe"; + sha256 = "0g3bx7jnyra8ia11k7bqv0j41pwkbdz7bxzffxn20dyc69vkahxz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13419,12 +13443,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-06-11"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "665ef24144b748b842a0a27c237e63f3447f901a"; - sha256 = "1yh9phdrax4b5v9bb37n8bzxbi6a8ca422c90f73r9cwgvfx4i2v"; + rev = "a64d097a1af1772c24d13f34529b9be2a34b7721"; + sha256 = "13g79hgfqaismmd74751v3c5nhv8dmmrv5qpqbx7ghh3zd7h65kv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -13479,12 +13503,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2024-01-24"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7"; - sha256 = "1bih86rm14788b73dkpfzv2ahrca3vxahd5pc39lx122ma31l639"; + rev = "008b7773e5f2cba625a5fcc5acc543b28b19cd26"; + sha256 = "0qligdiaxa7liikgm4hpda8i51y1dyzd1xq7c2kwk4ysxadlvk5k"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -14021,12 +14045,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-17"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "5ad2c6b625d40d929d58cddeca9c459d5f380755"; - sha256 = "0bmm3z4njnajv1qzqam9i9lfsaxfw8n792wzdyg7yklp534zaxxn"; + rev = "c771fb5f00fd219833600c8164e6befe3c163b9a"; + sha256 = "0jlyy64m6zwvjs3w61vp2zv9rwdds1g3pk4wknvq493fcyxc59wa"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14249,12 +14273,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-02-25"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "f7ccf006df1aefd327c0e2c55cc8632a2db577c1"; - sha256 = "11hnym6gzvss1pwjxqsbg4f1h56hsnaypl35bd084lxhim7fz6zl"; + rev = "a8f244a4e9527992acd89c578933ad1d3940d276"; + sha256 = "1xxgyawfr3lw5qqgkalajmnanz4n1dmbw1fyv362b72jg7h19fh5"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -15150,12 +15174,12 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-03-15"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "729f3630a4c19e52e1fd825802d2a1659daeaf48"; - sha256 = "07mg6m47x9ab6awlc1kviahgzmfdxm1ykvnqrlf81msa5gb4a36k"; + rev = "3736bd4a5f23b30821cbb892385bb1f1b0088cfc"; + sha256 = "0q5jly140pjf9z6cc2n8g833glwpal07lrvkcq9ay3gn9pznpjwy"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -15318,12 +15342,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-04-12"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "8972461e64c7c4bf049f2f86ea1bc571e8077b55"; - sha256 = "08lzlk2lhfcyp45sk90h3j6diwz78c8hx0dm1wb9fykmiiipsr0c"; + rev = "2fba7907f585819a8653f0bc7dd7f437a822d9c6"; + sha256 = "0a2m0mszy2n8xi1c47a7w0kmrnxpzfirxnzjghkdm5nc2fn3rxgn"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -15366,12 +15390,12 @@ final: prev: vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2024-04-23"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "45e53f01e4e1c4a3ee20814de232162713aff578"; - sha256 = "12dqwhks52ng0hh98a1sbn5qjmwn77ch25h6n7kp1ffql6gjsadi"; + rev = "4a0df2f1b0f3d69e8f7e19afe464a7c3a7af89a2"; + sha256 = "07a5543ms7r129bb5d7iwhy4pdzy5ygz9w2gziczpcwj40b5932w"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -15738,12 +15762,12 @@ final: prev: vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "2024-01-24"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-solarized8"; - rev = "6178a07f442a1fe559673cef6ac2b7031ab21edb"; - sha256 = "0y0xhcd5p32sni889avjsbjm9g9afysfvfkihm763lj304rf7prs"; + rev = "c4fd8a45767dea23fe51816967cdb3c86436eaad"; + sha256 = "1673xf59xxh6npw85hzasdyxx7kbqp7hbkmyx77wc2id3la6s9x9"; }; meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; @@ -15786,12 +15810,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "64b8125fdca0e67cfe7c415f133809a4d23eb8b5"; - sha256 = "01r9wz4sc7qlaibi2hhrymcgzrfjchif3cn9w1q71prbvchjhpnm"; + rev = "a4e55d1119689a16e659ce95b673f7174a615637"; + sha256 = "0iba20wlhqvhrsh4nfd2gfm2iwix2zz16f0izmkc2h4q741rp86n"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16027,12 +16051,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-06-15"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "79c14672b0bfec6f92c626dc331326fdbed62b4f"; - sha256 = "0vbfnqggh2lwcpfx110phlasmdqq66fdjcgvanydj1vqpvfn8fsa"; + rev = "34aab77f7a63f20a623df45684156915f6182a55"; + sha256 = "0bvziqnnaimwrrjmz8k701ki4gdvlhvjkj4fxnb77ab8rc0sp13h"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16351,12 +16375,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-04-26"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "b84a6d42c1c10678928b0bf8327f378c8bc8af5a"; - sha256 = "1sj8nfn2yd1bsfqqf9kqpivxhfjcq1zq111ls9m6xh98ccxwcj7d"; + rev = "525521677deb8401b62054bbbbc9b17f8486de3d"; + sha256 = "0i8n47y9xg1583908sa8lhkvz146ch65i9afcmgrsngjys1ihaqb"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16772,12 +16796,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-13"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8ed94566e6fe3f5b163131dc374d224d2d320db7"; - sha256 = "13na944xyy8cj6pck6af4p9hhrr3811pa43zmmj42bxrf5kpbqds"; + rev = "2dc2a5435809c13f6f4aa07964be4ef19a7864f5"; + sha256 = "1s3w4kbdvwvqmpv82hkdizcr28dyx61mwxfg0k6hkhnpr7fimz6a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16796,12 +16820,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2024-03-16"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "69318e74c88ef7677e2496fd0a836446ceac61e8"; - sha256 = "0z7bh2zc5mxf5rdma160sdawm1czdqfhm6rq9lj1780g5snvc0ps"; + rev = "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf"; + sha256 = "0wv0lyfxd5dfgmj3j8qpf05014isrm1py9mrxkg6zh8gnbv7d72j"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -16868,12 +16892,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-05-19"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "ff3926901d4160886f707a8a70b5c2e82979a7c4"; - sha256 = "0x8930yals2cwbyw4vssfhb39pvrwpq90ysh1aczcyivrajm24ir"; + rev = "46212834b32866ce45479f885ca82d2259044f46"; + sha256 = "0lp101ac8ylflvdngv2xmpl8v00djrw4ca6pbrbf5jdl0wm1fnmq"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16952,12 +16976,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-17"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "da5f1e0a5acd70d4e44c54b4d6286fd8f97742ab"; - sha256 = "0aiy18yw2kkj1xb7ixlw86xlxpn1v1pqa19d05kr4jnbabdajcr4"; + rev = "e8cf7e92220fc1ed3c20c8744a511b917afba7b5"; + sha256 = "13fic83d631xxfaks2ncda3id5y8dy072sa56nkr9fr7yx9nbw6h"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17143,6 +17167,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yazi-nvim = buildVimPlugin { + pname = "yazi.nvim"; + version = "2024-06-29"; + src = fetchFromGitHub { + owner = "mikavilpas"; + repo = "yazi.nvim"; + rev = "05849f390175f2ba8fd277b224d4fd9e35455895"; + sha256 = "zj+lmxsOEW+YaCk5hb7u454gACUmqYPA/IeW6av4D7k="; + }; + meta.homepage = "https://github.com/DreamMaoMao/yazi.nvim"; + }; + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; @@ -17253,12 +17289,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-06-03"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "1f331d994d90f1dc93d023508951be437d19813e"; - sha256 = "0zq18axf849vv90nc5x3g2mr2wc6wphgwj3a8mmkr8q1rk16c9k4"; + rev = "15e24e96cb90889ebd12b5dbe800a958c716f520"; + sha256 = "1sjnwjv4spa2cn54mv2cndirypkzhm81zxjz0v7kb5pf39rlq03c"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17289,12 +17325,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-14"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c0bea773a09e49e123136b099bce9ddc1bf395d2"; - sha256 = "15ccqv7r382rk8l50ims0a9m5kn4kzgd3bar5427w12skayp0d09"; + rev = "31fcfb02c47952d5c75aec893b93b2878abe5fbb"; + sha256 = "0n883l071d197xqfji5dj3qgi3dvk1v9vmr1fdr1gnc9fmcpa672"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17325,24 +17361,24 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-06-17"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "2ab955cb0b5eaf0b00cc5064234064f02822f458"; - sha256 = "0ncr3kf7s0j2ghr0321vajsfphs4cp710xxrwdhphfxdpzxjlsbw"; + rev = "dcc90e04ac9c9392bf32c1e5f701353d8c5290c7"; + sha256 = "0a5lb5a4c5c39nhwy6vyb2d8qkjpwxdmlff84m4z116q332rc9b1"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-05-21"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "c707723cf0c0f19a409a6190209d51d6ec057943"; - sha256 = "14d1l8a6g0fflkqs2ks2fgawxl1qqhx36izxvz5yacz1yqz63dnb"; + rev = "f3e3ba2b47b57fc501b096a38b37bfc12f22f298"; + sha256 = "1ph3g127qynf797vnlq5kramkslj062bjzhpnxcsr9vjsn5a9x78"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17385,12 +17421,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-19"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "b20ee4855bd3cb9fbe0615cf0e27bbb8b04df13e"; - sha256 = "1wcvnx0s328md2zil1gwxqsl19jin5vmpxvzajjx52yxsrgm0qrm"; + rev = "568a0cb8595f1e5363dc220f01ca6f18517ff80a"; + sha256 = "0c3ihcl10mskp5jd1f9xnvypyrf0x5db1gks2i1fb63cmh64ibld"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17409,12 +17445,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-15"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "75a0044e5f4d164d93557fd49863e088f0ecf749"; - sha256 = "1md8gsibb1224df6qi2vnyxp5ja51vfppdziply33zdlh7qa6ycc"; + rev = "3c9e5cb6499f66a02c365f073145a835124a19ac"; + sha256 = "0bghzwkyqgp3g76irbadv3bx4npvnq2x16j6fdxc01906nn3iz95"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17457,12 +17493,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-06-09"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "8c4660cfe697621bcc61d37b3651ffed94fe7fed"; - sha256 = "1gdjd9a3y2kgsjg5ivxwmqymibgzhhj1h6lg7hq811jlip3p0p63"; + rev = "e10c9c6436556405ec6b187fd459a718f5c55156"; + sha256 = "0d7cv268gzrz47brax66h2kv2b4b6ks3vzdz97si8khh70jds59d"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17515,5 +17551,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + supermaven-nvim = buildVimPlugin { + pname = "supermaven-nvim"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "supermaven-inc"; + repo = "supermaven-nvim"; + rev = "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b"; + sha256 = "sha256-TeRWReHeEqP5I3tgfJdMDmHvL83NDCENRMcQrKbPiqg="; + }; + meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c4a0aea589992..84865e7300448 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=10f21f3"; + version = "0.0.0+rev=5c9b47c"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"; - hash = "sha256-hBvDFLIN4n0dbpH8FKe0sY8t4Jwa0GtrLt2GG04Qgn8="; + rev = "5c9b47c6a978072808b356065fe8f223cdc8fc07"; + hash = "sha256-nln4A2zIaFvfvWMplMDV3XMlXLEFfqx68GiNoFSR2/c="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -182,12 +182,12 @@ }; bp = buildGrammar { language = "bp"; - version = "0.0.0+rev=2326d70"; + version = "0.0.0+rev=4e60cf3"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-bp"; - rev = "2326d709fb9cf73cf124fdbc803c267f851721a4"; - hash = "sha256-h9T8tfS2K85N9NLwYj6tu2MHPj4YyG/UBYoezfWuEyI="; + rev = "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"; + hash = "sha256-E8xL93rZx5I1RWXduBZdfVnogmha6TFQz4KerNWrpTI="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-bp"; }; @@ -259,12 +259,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=4864abb"; + version = "0.0.0+rev=69d7a8b"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "4864abb95a1f6e54d6b362677beef9fb674b41e9"; - hash = "sha256-asJ4BDARnQdc+d0H+DDpW+/gDGuEIbc8PVL0B3KrA0Y="; + rev = "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"; + hash = "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=1f188ef"; + version = "0.0.0+rev=b93070b"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"; - hash = "sha256-AZXk29yM21KOTVWWUKkr1+sr7gv7ViD6kDjwrJZoCzg="; + rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc"; + hash = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -425,12 +425,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=629676f"; + version = "0.0.0+rev=19dd5aa"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "629676fc3919606964231b2c7b9677d6998a2cb4"; - hash = "sha256-E2l971rSVAuSiLDVMto6hjViaxDLjA7LFQM+/evMXhk="; + rev = "19dd5aa52fe339a1d974768a09ee2537303e8ca5"; + hash = "sha256-pS+xTdJWhb0pmWecmlnQb6PwkAUTG5Sry3Jf7zWseU0="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -491,24 +491,24 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=648183d"; + version = "0.0.0+rev=809266e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; - hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; + rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; + hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=b5bdcb5"; + version = "0.0.0+rev=5a86415"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"; - hash = "sha256-fhHu8kniYOLhrlHLgfP1NHtBxURrM7GNn51zmPNcTIU="; + rev = "5a864159ff728b6d4f7d0aab3723f85a467d180f"; + hash = "sha256-w36h/4xGtGZpJu+ueZiO6K4Eln0DkNUw6a626urMbz4="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -603,12 +603,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=b8e44bc"; + version = "0.0.0+rev=da275db"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"; - hash = "sha256-9sfucj3jx5KVt/okHyCZLIJUbYFHPO4Ld/IWWjVXKDA="; + rev = "da275db3ae46bbd00f97d11f888d8c58c14faa6d"; + hash = "sha256-05V1VLmafWgdAHaNiBj4YYl9/W54j6TNSH5CLnh0fjY="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -779,12 +779,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=d8a4207"; + version = "0.0.0+rev=274e27e"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; - hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; + rev = "274e27ea0f09371122ab55b8a812a32d6ef644e8"; + hash = "sha256-W0aDOZ2uPXHGAbt/p3slyotw4dPsmgADnRAH3e9NT1Y="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -801,12 +801,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=edd817e"; + version = "0.0.0+rev=aa5c279"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "edd817e0532f179b7f7f371dc180629070945f0c"; - hash = "sha256-iipzgO8vJJpxhf/ZJh6tsfRa54C6g9rAN9TVdycKiqc="; + rev = "aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7"; + hash = "sha256-TjHaogOnerLUvCxEOBkqfc4ZtKmgmpU8vQyDmaDsO3Y="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -845,12 +845,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=7f91bf3"; + version = "0.0.0+rev=3736dfc"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "7f91bf34cadc06a96efc475df501ffca4dda9410"; - hash = "sha256-M676GDkyUGosih5R77duEy4jUrIz3bGwD+G6n68gJX0="; + rev = "3736dfc811c07fa749ca818f94c9a3977734dd26"; + hash = "sha256-BIEM9i7GItQZmOcJDMHm2yY+4xeL5x9BzZORtYOxr28="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -1032,12 +1032,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=422cbe1"; + version = "0.0.0+rev=9e3ec98"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; - hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; + rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b"; + hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -1077,12 +1077,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=5e1225a"; + version = "0.0.0+rev=80517ca"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "5e1225a30712ca0a9040509806c7ba274a1bbcde"; - hash = "sha256-gBByrpw5iCGoOy1zrg0emuAd1Vd8KOKFeJLZOCWh9qU="; + rev = "80517ca13317fb8591503c0d99f2ad76e8979a72"; + hash = "sha256-3MoTDW0LyZd0wge7R5d+H7QG9zPBykXVE73eJEWMdK8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1143,12 +1143,12 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=8d22f33"; + version = "0.0.0+rev=2dacda9"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "8d22f33faa5aa95c6526606fb656ada342e59e40"; - hash = "sha256-L+9cDLTmisZmdBXocK8u7fkJIlaZId9qeQxVWwFkdJg="; + rev = "2dacda923bafcfeae487e457df0fc1c95f6d1848"; + hash = "sha256-JunYDINufbrbVduLrrX73rD8L6MC5dEie8yq92qTFe4="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1165,23 +1165,23 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=c9012d6"; + version = "0.0.0+rev=6858695"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"; - hash = "sha256-yI/3DVX2SgvU+mP1KVe7OA8OtqXbaZG9/mTUQjUHCgk="; + rev = "6858695eba0e63b9e0fceef081d291eb352abce8"; + hash = "sha256-5csAj7k03QEEfkZE/EBmGjqUHPlFss3EWvExT4kaiQg="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=9f56001"; + version = "0.0.0+rev=966797b"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"; - hash = "sha256-L5O9pep1No4oWSM7nA71RYY2X688+rm/2pTETP7ifOA="; + rev = "966797b8c581526efdd2252f815dde6de1a8f932"; + hash = "sha256-q2aBAXUVjhcoHH7iZQllLkDF5ZMuIxNjWu72Xt+YdXA="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1220,12 +1220,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=2a05cab"; + version = "0.0.0+rev=3b08641"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "2a05cab838dfec52daa76f10920917d2e69a85bc"; - hash = "sha256-NOnm40FSzTX6Pf4NchH0hYcTwyxX/usEVKxz8KsIlk4="; + rev = "3b08641373cb3e37bc531e6e3cdb85d02b454702"; + hash = "sha256-0bCagqSY/MFAqJNajkaR8Y6J2YiXzOF249cm0pFjTfs="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1330,12 +1330,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=fd814fc"; + version = "0.0.0+rev=379fbe3"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "fd814fc6c579f68c2a642f5e0268cf69daae92d7"; - hash = "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU="; + rev = "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"; + hash = "sha256-rJXgKNYnAjpAh+1dfYH9W6v5t457ROLtjqU3ndzvjr8="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1407,12 +1407,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=cd82eb4"; + version = "0.0.0+rev=08d8b88"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"; - hash = "sha256-ptUIi8cMQ4CrnqZgnzJ0rnByd78y8l607+CSPKNrLEk="; + rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"; + hash = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1518,23 +1518,23 @@ }; luau = buildGrammar { language = "luau"; - version = "0.0.0+rev=5aa9b88"; + version = "0.0.0+rev=fbadc96"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luau"; - rev = "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"; - hash = "sha256-7cxnELiCmLOPecca3U2CN1F4CUSbL8upxAn0PxwU6dM="; + rev = "fbadc96272f718dba267628ba7b0e694c368cef3"; + hash = "sha256-qoKLG9hPyvcpDEssSrsUnr+w6B8qvXXIXLdvoCZhjic="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=d097b12"; + version = "0.0.0+rev=9e082a2"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; - hash = "sha256-y1nioJ2R0YgGLH7dkJsTxIkejfMnh1CU+A++yTaQdb0="; + rev = "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"; + hash = "sha256-QJZDozY0UO7tWemKGk3MjDrM/bjpbwCJbWXY0fTL9fQ="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1575,12 +1575,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=79d8b25"; + version = "0.0.0+rev=2825fb5"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "79d8b25f57b48f83ae1333aff6723b83c9532e37"; - hash = "sha256-DCAMxQqWHM54yzNzF1FjaU0+vETbLhfSZXNq+62DzhE="; + rev = "2825fb578325ac308945318881445a89ea06e0f6"; + hash = "sha256-M7dECDfpRZHlkjCNvQcAneKR9KHf6HwtoHADZRjIB/Y="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1619,12 +1619,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=00c32d8"; + version = "0.0.0+rev=268bc99"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "00c32d8562dc957b187da110a3443307962b8da8"; - hash = "sha256-cyd9n1ydIEoBL+hnRiCSEC2S9H1hrWZlMCxVbxWyazI="; + rev = "268bc99020f7ba7a219f839e3a6a31c36ad0826b"; + hash = "sha256-jXcnM+LEY35GZd2HYtFE5Of4CBga1zZuGCPazKWAppA="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1653,12 +1653,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=43433d8"; + version = "0.0.0+rev=3039ad9"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "43433d8477b24cd13acaac20a66deda49b7e2547"; - hash = "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE="; + rev = "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"; + hash = "sha256-a4NU9tzQ+g9dxF3/LAkEm83QnEJcAoNcIrrQwXSSTPE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1697,12 +1697,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=b3cda61"; + version = "0.0.0+rev=0fdada1"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "b3cda619248e7dd0f216088bd152f59ce0bbe488"; - hash = "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y="; + rev = "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"; + hash = "sha256-hnY0lDF4S5W5DUJXNcXt2qySnCu16AgEiGmy/zQSzu4="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1752,24 +1752,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=cd95a67"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; + hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=cd95a67"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; + hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1964,6 +1964,32 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; + problog = buildGrammar { + language = "problog"; + version = "0.0.0+rev=d8bc22c"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "foxy"; + repo = "tree-sitter-prolog"; + rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; + hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + }; + location = "grammars/problog"; + meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + }; + prolog = buildGrammar { + language = "prolog"; + version = "0.0.0+rev=d8bc22c"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "foxy"; + repo = "tree-sitter-prolog"; + rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; + hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + }; + location = "grammars/prolog"; + meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + }; promql = buildGrammar { language = "promql"; version = "0.0.0+rev=77625d7"; @@ -2121,12 +2147,12 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=3914005"; + version = "0.0.0+rev=b1e211f"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "391400572538ff9854341a175ed8ab4b1e45f44b"; - hash = "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc="; + rev = "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"; + hash = "sha256-fgK8UGNaoJf3+lao/q1Vfd+2U/YNgrZu3kbyZ1qOIus="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2143,12 +2169,12 @@ }; ralph = buildGrammar { language = "ralph"; - version = "0.0.0+rev=48b9d9d"; + version = "0.0.0+rev=f6d81bf"; src = fetchFromGitHub { owner = "alephium"; repo = "tree-sitter-ralph"; - rev = "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"; - hash = "sha256-Yf2vq7h7UrJmdjQbXU8HM0hjUwwRBFlEV1O+ZUyMIuk="; + rev = "f6d81bf7a4599c77388035439cf5801cd461ff77"; + hash = "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA="; }; meta.homepage = "https://github.com/alephium/tree-sitter-ralph"; }; @@ -2251,14 +2277,25 @@ }; meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; }; + robots = buildGrammar { + language = "robots"; + version = "0.0.0+rev=8e3a420"; + src = fetchFromGitHub { + owner = "opa-oz"; + repo = "tree-sitter-robots-txt"; + rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"; + hash = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME="; + }; + meta.homepage = "https://github.com/opa-oz/tree-sitter-robots-txt"; + }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=df46a85"; + version = "0.0.0+rev=6ea64b6"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "df46a85abda9f948d38f5d4e3684cec49c42fef2"; - hash = "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA="; + rev = "6ea64b6434a45472bd87b0772fd84a017de0a557"; + hash = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2286,12 +2323,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=dc2d7d6"; + version = "0.0.0+rev=0ffe457"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b"; - hash = "sha256-HV/hJwftBTCj9WomIcLB6n0LcQRHAzlQsJBNOxu6XJo="; + rev = "0ffe457fb6aabf064f173fd30ea356845cef2513"; + hash = "sha256-E46Y++kaipMWZwyfQ40tWj3CTIP25XQ90x2FsQaQ63s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -2308,12 +2345,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=b76db43"; + version = "0.0.0+rev=599d12b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "b76db435a7f876cf1ede837d66054c534783c72f"; - hash = "sha256-AZ1YIsnw3x84T2ubwWoekfy98L2GdgQP0R3tM8DEXLM="; + rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"; + hash = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2353,12 +2390,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=865d79e"; + version = "0.0.0+rev=ea77a4d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "865d79e236c7f0e04276c969453d021d1da4b15f"; - hash = "sha256-vZ+Av0lSJaSKUVdEGMtAtXwGIUaIUvS5CvWWfOei/30="; + rev = "ea77a4d91dd93f4483965efcc41f3faebb9131c8"; + hash = "sha256-X+fQoAe9VZekDERw55vz7viXtcVhuZxtAZDYlh4F4Tg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2454,12 +2491,12 @@ }; sparql = buildGrammar { language = "sparql"; - version = "0.0.0+rev=05f949d"; + version = "0.0.0+rev=d853661"; src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; - rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; - hash = "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ="; + rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58"; + hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU="; }; meta.homepage = "https://github.com/BonaBeavis/tree-sitter-sparql"; }; @@ -2564,12 +2601,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=d657f98"; + version = "0.0.0+rev=631f1e6"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"; - hash = "sha256-KE+qjTP3UWKvcLJPYIJmEGeKBWAdpCzgW4/vIccueng="; + rev = "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"; + hash = "sha256-/nMRcZc5fWUJ+GpVnlERHjtahXGh6NwrNNQPkNM5Y9E="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2596,6 +2633,17 @@ }; meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; }; + systemverilog = buildGrammar { + language = "systemverilog"; + version = "0.0.0+rev=a478beb"; + src = fetchFromGitHub { + owner = "zhangwwpeng"; + repo = "tree-sitter-systemverilog"; + rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"; + hash = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM="; + }; + meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; + }; t32 = buildGrammar { language = "t32"; version = "0.0.0+rev=6182836"; @@ -2620,12 +2668,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=034df21"; + version = "0.0.0+rev=91cc49a"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "034df2162ed7b654efd999942e266be713c7cde0"; - hash = "sha256-2+MVrDPuhrM0HE9uRG5LpmyXYy73Pv3MY20UXwBXalM="; + rev = "91cc49a83f4f0b3a756bf7d0e65403a9cf757003"; + hash = "sha256-/u1ZLk9e7uowTnSkxrwXOOmcesqp3uDTRJOshKNc8lQ="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -2654,23 +2702,23 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=cf84ea5"; + version = "0.0.0+rev=a4f14aa"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "cf84ea53e2e2531f23009d676ac206090c1e2392"; - hash = "sha256-CQ11t4beqkjhtZktrawuavgQPSFzbwJrU/aSbPsqBPA="; + rev = "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"; + hash = "sha256-O5eKY9twQJp0qHjIs6juEY0VtOYXAdnlzlomh9YNndI="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=422cbe1"; + version = "0.0.0+rev=9e3ec98"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; - hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; + rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b"; + hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -3001,12 +3049,12 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=1e12c79"; + version = "0.0.0+rev=0f06f24"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "1e12c7925c41bb09818d86e30cd78644fde7d31a"; - hash = "sha256-7pntsp8mqXyQK+81FefZv32GNlJsnOWIhvJ9o6Q4FUQ="; + rev = "0f06f24e259ac725045956436b9025dab008ff9f"; + hash = "sha256-/HNDdI2Tg6YG/lAvubZtN2g6pUCk0Kl4kRTRsABIm0Y="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; @@ -3034,23 +3082,23 @@ }; xcompose = buildGrammar { language = "xcompose"; - version = "0.0.0+rev=2383cc6"; + version = "0.0.0+rev=fff3e72"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xcompose"; - rev = "2383cc69a2c42cfade41c7cb971fb3862bec6df1"; - hash = "sha256-N8pJhB35IApb41TKn6NuVMEgmQGC+1Nyu5eQck1K5g8="; + rev = "fff3e72242aa110ebba6441946ea4d12d200fa68"; + hash = "sha256-PNg1z+7CuvpQdksKJOCQ59dZrv4PORdYo6CSw3GrBtk="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=648183d"; + version = "0.0.0+rev=809266e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; - hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; + rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; + hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -3101,12 +3149,12 @@ }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=7c5a29b"; + version = "0.0.0+rev=2bac4cc"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "7c5a29b721d409be8842017351bf007d7e384401"; - hash = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ="; + rev = "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"; + hash = "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f2d7640a83e1e..24c6eb1bf0313 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -25,7 +25,6 @@ , fzf , gawk , git -, gnome , himalaya , htop , jq @@ -58,6 +57,7 @@ , xorg , xxd , zathura +, zenity , zsh , # codeium-nvim dependencies codeium @@ -79,6 +79,8 @@ , CoreServices , # nvim-treesitter dependencies callPackage +, # Preview-nvim dependencies + md-tui , # sg.nvim dependencies darwin , # sved dependencies @@ -406,12 +408,12 @@ codesnap-nvim = let - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-nS/bAWsBQ1L4M9437Yp6FdmHoogzalKlLIAXnRZyMp0="; + hash = "sha256-KttvOfMieO+lBEgvkrBztWg7pUm/gFxYaTVXAQv15IM="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -419,7 +421,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-FTQl5WIGEf+RQKYJ4BbIE3cCeN+NYUp7VXIrpxB05tU="; + cargoHash = "sha256-IZtWfyDZEaFSuj3uXBhBuGPi4IN1Dwt0ZkMSoxAum5c="; nativeBuildInputs = [ pkg-config @@ -451,7 +453,10 @@ doInstallCheck = true; nvimRequireCheck = "codesnap"; - meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + meta = { + homepage = "https://github.com/mistricky/codesnap.nvim/"; + changelog = "https://github.com/mistricky/codesnap.nvim/releases/tag/v${version}"; + }; }; command-t = super.command-t.overrideAttrs { @@ -1275,6 +1280,15 @@ nvimRequireCheck = "plenary"; }; + Preview-nvim = super.Preview-nvim.overrideAttrs { + patches = [ + (substituteAll { + src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch; + mdt = lib.getExe md-tui; + }) + ]; + }; + range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = with self; [ cmd-parser-nvim ]; }; @@ -1603,7 +1617,7 @@ vCoolor-vim = super.vCoolor-vim.overrideAttrs { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome.zenity ]; + propagatedBuildInputs = [ zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; diff --git a/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch b/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch new file mode 100644 index 0000000000000..e8082f51c3702 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch @@ -0,0 +1,22 @@ +diff --git a/lua/preview.lua b/lua/preview.lua +index 6d9875d..729cc70 100644 +--- a/lua/preview.lua ++++ b/lua/preview.lua +@@ -28,7 +28,7 @@ local function open_window(file) + vim.env.MDT_WIDTH = width + + vim.cmd.vnew() +- vim.fn.termopen("mdt " .. file) ++ vim.fn.termopen("@mdt@ " .. file) + + vim.cmd("setlocal nonumber norelativenumber") + vim.api.nvim_feedkeys("a", "t", false) +@@ -49,7 +49,7 @@ end + function M.setup() + -- Check if "mdt" is installed + if vim.fn.executable("mdt") == 0 then +- install() ++ -- install() + end + + set_cmd() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 98f71881c900d..5b69dc3dc2953 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -21,6 +21,7 @@ https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, https://github.com/chrisbra/NrrwRgn/,, https://github.com/vim-scripts/PreserveNoEOL/,, +https://github.com/henriklovhaug/Preview.nvim/,HEAD, https://github.com/yssl/QFEnter/,, https://github.com/chrisbra/Recover.vim/,, https://github.com/vim-scripts/Rename/,, @@ -874,6 +875,7 @@ https://github.com/folke/styler.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, https://github.com/kvrohit/substrata.nvim/,HEAD, +https://github.com/supermaven-inc/supermaven-nvim/,HEAD, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, https://github.com/peterbjorgensen/sved/,, @@ -1444,6 +1446,7 @@ https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/mikavilpas/yazi.nvim/,HEAD, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 724e9004b29df..7d228272f9e3d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -860,7 +860,7 @@ let description = "Soothing pastel theme for VSCode"; license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc"; - maintainers = [ lib.maintainers.nullx76 ]; + maintainers = [ ]; }; }; catppuccin-vsc-icons = buildVscodeMarketplaceExtension { @@ -1262,8 +1262,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.4.4"; - hash = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; + version = "3.0.10"; + hash = "sha256-EVmexnTIQQDmj25/rql3eCfJd47zRui3TpHol6l0Vgs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; @@ -3078,7 +3078,7 @@ let description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv"; - maintainers = [ lib.maintainers.nullx76 ]; + maintainers = [ ]; }; }; @@ -3397,8 +3397,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.347.0"; - hash = "sha256-E9H1nPWG5JuzBxbYc/yWd8Y3azEWrd9whGirl0GK7kU="; + version = "0.376.0"; + hash = "sha256-fJ8ZcwGFWXzJZ8UgnzTxR+842vjiU0qCjV/zWzbq/KQ="; }; meta = { description = "Open any folder or repository inside a Docker container"; diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index eb6b5ab49626c..8abf052323b22 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -28,6 +28,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/qjebbs/vscode-plantuml"; changelog = "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.victormignot ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 8edde8c3d7334..35ed549fd4188 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-tQjeKqNIhsf2nLdvncH1X6R9HiSTaizBtlAgrfAGtWs="; + hash = "sha256-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ac4d1d69795bb..78a063e6ee367 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0d0cgsiafmr1wmxqji7mi4hmms7zqql868bcfbq9lmkw96zw85dw"; - x86_64-darwin = "1zga9zm25h33m42cdnbkpzx5vbcwm9n7036qapq8pgrb23mals7f"; - aarch64-linux = "0wsdcny0y8xfvdf62qh792ifcq1am8i8xkchh5rscjc3xli6r86s"; - aarch64-darwin = "13jd39lm667206ga8fqbdb7mdqbkmbgq1l7wid3h4yanz87zbm99"; - armv7l-linux = "1xpvcypm0xnwjmbj2c1a245yav3nwi0g2k564x91vazfw4nmi7mv"; + x86_64-linux = "0bzf0mx1rgndpdd4a97kr01xsgsgp86gyscg8js2cvaad4265bmv"; + x86_64-darwin = "1m7f91cqbbv00difvfqld8fqkj9kvyddihmzi3zyzn4gfkv8gvf0"; + aarch64-linux = "09mxsk4qkq34yg1sd67cdasfxwdhdzcfij50fv1nl3kdjzp2i0iz"; + aarch64-darwin = "1jxjzfz6gr0pcp2anwjqwm38ma2i8fnzf5zpscfdklrlbhf438k2"; + armv7l-linux = "1yp4npgw4dkx8halsr1vm5ll1w4phx67dwd4krz1914mddx7x2kr"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.2"; + version = "1.91.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "5437499feb04f7a586f677b155b039bc2b3669eb"; + rev = "ea1445cc7016315d0f5728f8e8b12a45dc0a7286"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "18npvj29g9xwjyxv3a0fxipk30hgm487cfr3d91dvp5hxhl4dwwr"; + sha256 = "08mgfrwiji16q8x8kwmw3pdmb0325hfr9pd2fa5g5kmy9gnfw38v"; }; }; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 7458618a1e143..313b7fb6ce8ae 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-xsNqzicI11dM/DjY00pXaPpQdHA0ltP23g34fMWUoUA="; + sha256 = "sha256-EwBcgFHw6Mh+eS5hfTLoywH0dVt/TpNt4y6xQxe/x/Q="; }; patches = [ |