From 450c0da6d7a60b54eaf0720d6bcde4a5d23d6639 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Wed, 8 Jul 2015 18:44:30 +1200 Subject: [PATCH] vimPlugins: change wombat256 source to github See issue #8694. Previously wombat256 was downloading its source from the vim website using fetchurl. The builder was failing when it tried to unpack the .vim source file. Using the vim-scripts github repo avoids this problem. --- pkgs/misc/vim-plugins/default.nix | 18 ++++++++---------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b91a1a2ae106..056f6d1e9d3a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -80,6 +80,7 @@ rec { vimshell = vimshell-vim; watchdogs = vim-watchdogs; webapi-vim = WebAPI; + wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -1315,18 +1316,15 @@ rec { }; - wombat256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "wombat256"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; - name = "wombat256mod.vim"; - sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn"; + wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "wombat256-vim-2010-10-17"; + src = fetchgit { + url = "git://github.com/vim-scripts/wombat256.vim"; + rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; + sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05"; }; - buildInputs = [ unzip ]; dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=2465"; - }; + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 972754ec2baf..91d7f32fce53 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -57,6 +57,7 @@ "github:vim-scripts/a.vim" "github:vim-scripts/align" "github:vim-scripts/tabmerge" +"github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" "matchit.zip" @@ -97,4 +98,3 @@ "vim-snippets" "vim2hs" "vundle" -"wombat256"