about summary refs log tree commit diff
path: root/pkgs/aszlig
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2021-07-02 18:19:40 +0200
committeraszlig <aszlig@nix.build>2021-07-02 18:19:40 +0200
commit05900568cbae67603afbab9f20a67c75e5a477bd (patch)
tree60929626cdab1b1cc817cb4db41eb6ce8c70e781 /pkgs/aszlig
parent53acfc16a196caf9e1e95f4a592d78ea82272ec3 (diff)
aszlig/vim: Switch to dedicated plugin for Jinja2
The Vim syntax highlighting plugin file is no longer[1] shipped with
Jinja2 version 3.x, so the build fails accordingly with:

  install: cannot stat 'ext/Vim/jinja.vim': No such file or directory

In another upstream pull request[2] one of the project members mentioned
another syntax plugin which apparently seems to be more up to date. This
is what I'm hereby switching to as a replacement.

[1]: https://github.com/pallets/jinja/pull/1196
[2]: https://github.com/pallets/jinja/issues/1007

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig')
-rw-r--r--pkgs/aszlig/vim/default.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/aszlig/vim/default.nix b/pkgs/aszlig/vim/default.nix
index 13c436ec..ce451770 100644
--- a/pkgs/aszlig/vim/default.nix
+++ b/pkgs/aszlig/vim/default.nix
@@ -337,13 +337,11 @@ let
       installPhase = "cp -r data/syntax-highlighting/vim \"$out\"";
     };
 
-    jinja2 = stdenv.mkDerivation {
-      name = "jinja2-vim-${python3Packages.jinja2.version}";
-      inherit (python3Packages.jinja2) src;
-      phases = [ "unpackPhase" "installPhase" ];
-      installPhase = ''
-        install -vD -m 0644 ext/Vim/jinja.vim "$out/syntax/jinja.vim"
-      '';
+    jinja2 = fetchFromGitHub {
+      owner = "Glench";
+      repo = "Vim-Jinja2-Syntax";
+      rev = "2c17843b074b06a835f88587e1023ceff7e2c7d1";
+      sha256 = "13mfzsw3kr3r826wkpd3jhh1sy2j10hlj1bv8n8r01hpbngikfg7";
     };
 
     xdebug = fetchurl {