4 files changed, 27 insertions, 3 deletions
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index 10147e00..f70ca90f 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -12,8 +12,10 @@ endif
 runtime compiler/rustc.vim
 let current_compiler = "cargo"
 
+" vint: -ProhibitAbbreviationOption
 let s:save_cpo = &cpo
 set cpo&vim
+" vint: +ProhibitAbbreviationOption
 
 if exists(':CompilerSet') != 2
     command -nargs=* CompilerSet setlocal <args>
@@ -41,8 +43,10 @@ CompilerSet errorformat+=
             \%-Gnote:\ Run\ with\ \`RUST_BACKTRACE=%.%#,
             \%.%#panicked\ at\ \\'%m\\'\\,\ %f:%l:%c
 
+" vint: -ProhibitAbbreviationOption
 let &cpo = s:save_cpo
 unlet s:save_cpo
+" vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
 
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
new file mode 100644
index 00000000..bd8791f7
--- /dev/null
+++ b/compiler/nix-build.vim
@@ -0,0 +1,15 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
+  
+if exists('current_compiler')
+    finish
+endif
+let current_compiler = 'nix-build'
+
+if exists(":CompilerSet") != 2
+    command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet errorformat=error:\ %m\ at\ %f:%l:%c,builder\ for\ \'%m\'\ failed\ with\ exit\ code\ %n,fixed-output\ derivation\ produced\ path\ \'%s\'\ with\ %m
+CompilerSet makeprg=nix-build
+
+endif
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index b990bd48..a8a10e19 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -26,6 +26,7 @@ CompilerSet errorformat=
     \%E%f:%l:in\ `%*[^']':\ %m,
     \%-Z\ \ \ \ \ %\\+\#\ %f:%l:%.%#,
     \%E\ \ \ \ \ Failure/Error:\ %m,
+    \%E\ \ \ \ \ Failure/Error:,
     \%C\ \ \ \ \ %m,
     \%C%\\s%#,
     \%-G%.%#
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 23390fd9..bbb13189 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -11,8 +11,10 @@ if exists("current_compiler")
 endif
 let current_compiler = "rustc"
 
-let s:cpo_save = &cpo
+" vint: -ProhibitAbbreviationOption
+let s:save_cpo = &cpo
 set cpo&vim
+" vint: +ProhibitAbbreviationOption
 
 if exists(":CompilerSet") != 2
     command -nargs=* CompilerSet setlocal <args>
@@ -45,8 +47,10 @@ CompilerSet errorformat+=
             \%-G%*[\ ]^%*[~],
             \%-G%*[\ ]...
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+" vint: -ProhibitAbbreviationOption
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8: