diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index cc40709d5b9e..b00baa3ab6ca 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -314,8 +314,9 @@ let
       in
 
       (toVimPlugin (
-        stdenv.mkDerivation {
-          name = "nvim-treesitter-grammar-${name}";
+        stdenv.mkDerivation (finalAttrs: {
+          pname = "nvim-treesitter-grammar-${name}";
+          inherit (grammar) version;
 
           origGrammar = grammar;
           grammarName = name;
@@ -349,7 +350,7 @@ let
             platforms = lib.platforms.all;
           }
           // grammar.meta;
-        }
+        })
       ));
 
   /*
diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
index 4d9f11b9b937..6fd6c0f87413 100644
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@@ -494,8 +494,11 @@ rec {
 
   toVimPlugin =
     drv:
+    let
+      drv-name = drv.name or "${drv.pname}-${drv.version}";
+    in
     drv.overrideAttrs (oldAttrs: {
-      name = "vimplugin-${oldAttrs.name}";
+      name = "vimplugin-${drv-name}";
       # dont move the "doc" folder since vim expects it
       forceShare = [
         "man"