From 300941ceb778d2c4b37627af7d5346346d5b8fd2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jul 2017 07:32:00 +0200
Subject: pkgs/vim: Switch Haxe plugin to vaxe

The Haxe plugin(s) I've used so far (vim-haxe and vim-haxe-syntax) are
no longer actively maintained since 2014.

On the other hand "vaxe" is based on the work on vim-haxe and
vim-haxe-syntax, is actively maintained and supports newer language
features of Haxe as well.

I've patched out syntax highlighting for ',' and ';', because I really
get eye cancer with this and reminds me a bit about the annoying bold
colons when using nickname completion back in the days where BitchX
users were widely seen on IRC.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/aszlig/vim/default.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'pkgs/aszlig/vim')

diff --git a/pkgs/aszlig/vim/default.nix b/pkgs/aszlig/vim/default.nix
index 200f217c..e1f6f4cf 100644
--- a/pkgs/aszlig/vim/default.nix
+++ b/pkgs/aszlig/vim/default.nix
@@ -99,13 +99,6 @@ let
       sha256 = "0ablzl5clgfzhzwvzzbaj0cda0b4cyrj3pbv02f26hx7rfnssaqm";
     };
 
-    vimHaxeSyntax = fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-haxe-syntax";
-      rev = "500acc2f2ab92d77ff6cd04fdc7868800c033dfa";
-      sha256 = "1ipm0igplplfmscm3bk95qpf9rw71h133l9shmw54mxr4h0ymnmj";
-    };
-
     tlib = fetchFromGitHub {
       owner = "tomtom";
       repo = "tlib_vim";
@@ -134,11 +127,15 @@ let
       sha256 = "0sybkx8iy8qhr6nlwn52j7zd5v99rn0b8wbg43d112z2px4yq5x3";
     };
 
-    vimHaxe = fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-haxe";
-      rev = "8efc705db41a01713d67d437f29866a1ff831e8a";
-      sha256 = "15kv13gvpgf23p0566qrlw7gmpir2z7g5dnkfs1knmcwzw45am5d";
+    vaxe = fetchFromGitHub {
+      owner = "jdonaldson";
+      repo = "vaxe";
+      rev = "d5f905f806c7c90bb116d4b06a78924341840021";
+      sha256 = "0axvavzxbi3m4shva1m0cm6finl1i2rwqgn6lnklxnr2g9sfi4j7";
+      extraPostFetch = ''
+        # Do not highlight ',' and ';'.
+        sed -i -e '/\<haxeOperator2\>/d' "$out/syntax/haxe.vim"
+      '';
     };
 
     factor = extractSubdir "misc/vim" (fetchFromGitHub {
-- 
cgit 1.4.1