Merge pull request #236315 from ncfavier/vim-nix

vim-full: remove redundant nix support patches

pkgs/applications/editors/vim/ft-nix-support.patch

@@ -1,20 +0,0 @@
-diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index a8e6261..2b008fc 100644
---- a/runtime/filetype.vim
-+++ b/runtime/filetype.vim
-@@ -2258,6 +2258,9 @@ au BufNewFile,BufRead *.zsql			call s:SQL()
- " Z80 assembler asz80
- au BufNewFile,BufRead *.z8a			setf z8a
- 
-+" Nix
-+au BufNewFile,BufRead *.nix		setf nix
-+
- augroup END
- 
- 
-@@ -2440,3 +2443,5 @@ endfunc
- " Restore 'cpoptions'
- let &cpo = s:cpo_save
- unlet s:cpo_save
-+
-+

pkgs/applications/editors/vim/full.nix

@@ -24,7 +24,7 @@
 , netbeansSupport   ? config.netbeans or true       # Enable NetBeans integration support.
 , ximSupport        ? config.vim.xim or true        # less than 15KB, needed for deadkeys
 , darwinSupport     ? config.vim.darwin or false    # Enable Darwin support
-, ftNixSupport      ? config.vim.ftNix or true      # Add .nix filetype detection and minimal syntax highlighting support
+, ftNixSupport      ? config.vim.ftNix or true      # Add nix indentation support from vim-nix (not needed for basic syntax highlighting)
 }:
 
 
@@ -61,7 +61,7 @@ let
 
   common = callPackage ./common.nix {};
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
 
   pname = "vim-full";
 
@@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
     default = common.src; # latest release
   };
 
-  patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch;
+  patches = [ ./cflags-prune.diff ];
 
   configureFlags = [
     "--with-features=${features}"
@@ -163,10 +163,9 @@ in stdenv.mkDerivation rec {
   # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
 
-  preConfigure = "" + lib.optionalString ftNixSupport ''
+  preConfigure = lib.optionalString ftNixSupport ''
       cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
       cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
-      cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
     '';
 
   preInstall = ''

pkgs/top-level/all-packages.nix

@@ -34995,7 +34995,7 @@ with pkgs;
 
   macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; };
 
-  vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
+  vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
     inherit (darwin) libobjc;
   });