From 3f0a9f0a27ccc41059c8012b9c493b7310791707 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 1 Nov 2014 06:35:35 +0100
Subject: vim: Use correct name for single vimscript files.

Just threw me out of zone, because I was terribly annoyed on why the
hell Python indentation isn't done correctly anymore. If the file path
is something like "indent/script4316.vim", Vim won't load it because
it's searching for "indent/$ftname.vim".

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

(limited to 'pkgs')

diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 588df3bc..dd49f486 100644
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  fetchVimScript = { srcId, sha256, type }: let
+  fetchVimScript = { srcId, sha256, type, name }: let
     baseUrl = "http://www.vim.org/scripts/download_script.php";
     src = fetchurl {
       name = "script${toString srcId}.vim";
@@ -13,7 +13,7 @@ let
   in stdenv.mkDerivation {
     name = "vim-${type}-${toString srcId}";
     buildCommand = ''
-      install -vD -m 0644 "${src}" "$out/${type}/script${toString srcId}.vim"
+      install -vD -m 0644 "${src}" "$out/${type}/${name}.vim"
     '';
   };
 
@@ -142,18 +142,21 @@ let
     };
 
     glsl = fetchVimScript {
+      name = "glsl";
       srcId = 3194;
       sha256 = "1vqfcpjmfyjc95wns3i84kgd1k5r2lwjjvjcprygi9g9vng7i5xc";
       type = "syntax";
     };
 
     actionScript = fetchVimScript {
+      name = "actionscript";
       srcId = 1205;
       sha256 = "0pdzqg678lhn7lmqf3z9icpj6ff2nnghsxy983kxkn8sblnzlhfs";
       type = "syntax";
     };
 
     indentPython = fetchVimScript {
+      name = "python";
       srcId = 4316;
       sha256 = "1pgdiaqd1hm0qpspy1asj7i103pq0846lnjrxvl6pk17ymww9pmk";
       type = "indent";
@@ -174,12 +177,14 @@ let
     };
 
     indentHaskell = fetchVimScript {
+      name = "haskell";
       srcId = 7407;
       sha256 = "1lj44jkyihmcnj2kcfckhqzr9gfipda9frbzicix2wrc5728kjsv";
       type = "indent";
     };
 
     fishSyntax = fetchVimScript {
+      name = "fish";
       srcId = 20242;
       sha256 = "12gfmyxxf84f19bp8xfmkb9phbfkifn89sjgi8hnv6dn0a5y1zpj";
       type = "syntax";
-- 
cgit 1.4.1