From 22c382665c24682f7e5433ff1f15d2004bf39338 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 15 Aug 2022 16:50:20 +0200 Subject: pkgs/vim: Use postFetch instead of extraPostFetch We no longer need to use extraPostFetch in order to append stuff to the postFetch phase of fetchzip. Since this got fixed[1], we now get appropriate warnings during evaluation: warning: use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub'. Neither do we like warnings nor do we like to use workarounds from the past that got fixed, so let's fix it on our side as well :-) [1]: https://github.com/NixOS/nixpkgs/pull/173430 Signed-off-by: aszlig --- pkgs/aszlig/vim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/aszlig/vim/default.nix b/pkgs/aszlig/vim/default.nix index c80f1d53..2a8ca5cb 100644 --- a/pkgs/aszlig/vim/default.nix +++ b/pkgs/aszlig/vim/default.nix @@ -138,7 +138,7 @@ let repo = "vaxe"; rev = "d5f905f806c7c90bb116d4b06a78924341840021"; sha256 = "0axvavzxbi3m4shva1m0cm6finl1i2rwqgn6lnklxnr2g9sfi4j7"; - extraPostFetch = '' + postFetch = '' # Do not highlight ',' and ';'. sed -i -e '/\/d' "$out/syntax/haxe.vim" ''; @@ -286,7 +286,7 @@ let repo = "csv.vim"; rev = "443fa8bd2a1a017b26cc421a9494e1a1e33f4acf"; sha256 = "1pbgl9f00kqxr2dpxmxg9jnk5q41sxzgan7hn16hc2b4as3zbihd"; - extraPostFetch = '' + postFetch = '' # Use sane (non-UTF8) settings for separators sed -i -e 's/(&enc *[=~#]\+ *.utf-8. *?[^:]*: *\([^)]*\))/\1/g' \ "$out/ftplugin/csv.vim" "$out/syntax/csv.vim" @@ -305,7 +305,7 @@ let repo = "org.ats-lang.toolats"; rev = "e0c5499dfa5c65b4aa3bf031247c768f826f3de8"; sha256 = "0g1qrq4f4gq0yrnlslrjz03m0997rd343b22w21w7359hydlqzax"; - extraPostFetch = '' + postFetch = '' mv -t "$out" "$out/org.ats-lang.toolats.vim/ftdetect" \ "$out/org.ats-lang.toolats.vim/syntax" rm -rf "$out/org.ats-lang.toolats"* \ -- cgit 1.4.1