From 411545b0385c04caf41849531587a9c6ebd93b5d Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 5 Feb 2015 23:54:54 +0000 Subject: [PATCH] update vam, vim2nix, fixes 6183 --- pkgs/misc/vim-plugins/default.nix | 162 ++++++++++++++++++------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 117 insertions(+), 47 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d08099542331..548519e7abb9 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -613,6 +613,7 @@ rec { syntastic = Syntastic; webapi-vim = WebAPI; yankring = YankRing; + "sourcemap.vim" = sourcemap; ### The following derivations are generated by nix#ExportPluginsForNix @@ -636,8 +637,8 @@ rec { name = "Gist"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "d609d93472db9cf45bd701bebe51adc356631547"; - sha256 = "e5cabc03d5015c589a32f11c654ab9fbd1e91d26ba01f4b737685be81852c511"; + rev = "8a567b823163d349406dffaff4519e0bac10eade"; + sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88"; }; dependencies = []; @@ -676,8 +677,8 @@ rec { name = "Supertab"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "b0ca47f4570385043f270f9278ba6d50d1d2fa00"; - sha256 = "24e3e63096a6b6f7f00d985ae6f31377154566d6483fb81572a474053fa43082"; + rev = "454c06e25680799b6f408622d6bfbaf920ace825"; + sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01"; }; dependencies = []; @@ -686,8 +687,8 @@ rec { name = "Syntastic"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "30b4ce3411f539f695ab8def7fc69c2f835eb8fe"; - sha256 = "c61e2bcd4455525ec2520d75e7b204e39757731f85f5f72ed179f2068ac33700"; + rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52"; + sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723"; }; dependencies = []; @@ -706,8 +707,8 @@ rec { name = "Tagbar"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "f9c5f24576e82aae5ab8a5480f1ae48615354e40"; - sha256 = "e1ff486f27c0980fee959db69da5617c4653910504b20aeabe87037a8b68712a"; + rev = "00dfa82b00e734b453153564efeec933c48087f0"; + sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635"; }; dependencies = []; @@ -736,8 +737,8 @@ rec { name = "UltiSnips"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "b26f2c97b7d9be708eef0b4ba0cdfb53c868d9c3"; - sha256 = "094055f6255d207c04e26f15ee15019eb9d4b1710c24061c7f8074d23583b9b2"; + rev = "d693259abb2e28f70abf760d395fcf526d5272ee"; + sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600"; }; dependencies = []; @@ -746,8 +747,8 @@ rec { name = "VimOutliner"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; - rev = "469f49b5f28bc2b838a80568c9413f690cc3ffb6"; - sha256 = "38f88f9bbc43622809404c0054a7a4e9b2214166f3b2784511e4fda05bcb4713"; + rev = "7c995f973c54b0d026137615af28059890edb197"; + sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5"; }; dependencies = []; @@ -801,8 +802,8 @@ rec { name = "extradite"; src = fetchgit { url = "git://github.com/int3/vim-extradite"; - rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; - sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; + rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; + sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714"; }; dependencies = []; @@ -811,8 +812,8 @@ rec { name = "fugitive"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "2c8461db084d205903a792a23163faa546f143c9"; - sha256 = "c2569877958fcc5d181cc5b9e26d6b0b022c30aa9ce0908dd96131b44eb90729"; + rev = "933f6a1e1df549564062f936bd1c836d28cf1676"; + sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908"; }; dependencies = []; @@ -831,10 +832,10 @@ rec { name = "github-MarcWeber-vim-addon-vim2nix"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-vim2nix"; - rev = "1aef89c05ef199fccff34be807ed7eefd914ca41"; - sha256 = "b078fd91cf978ee4cf7002630a83d3381ad781fa99e3ce118185b7f0f417ba2a"; + rev = "74345fa9858eb979c8d66cb59f07211f7c07ae69"; + sha256 = "76dbe055b9eecd107a4607ab8af32b39de3a342e63eadac5a9ddae6852ffdcec"; }; - dependencies = []; + dependencies = ["vim-addon-manager"]; }; "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -892,8 +893,8 @@ rec { name = "rust"; src = fetchgit { url = "git://github.com/wting/rust.vim"; - rev = "0fd423990cfa69336fb6c1d5d58aa2091e7b4e76"; - sha256 = "21f3decedb24478bc391152bf26a9b88d9e4fa5fcdbdb8a558d95b6bb7be2ff1"; + rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; + sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee"; }; dependencies = []; @@ -902,14 +903,14 @@ rec { name = "snipmate"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "8cb6c3ebe267873dc5abb9a36305c75d9564dea4"; - sha256 = "f4692709724a50ff14ccdd5692d90ebdb950417267adb2228f5ce6006471bad4"; + rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5"; + sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; - "sourcemap.vim" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap.vim"; + "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sourcemap"; src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; @@ -922,8 +923,8 @@ rec { name = "surround"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; - sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; + rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd"; + sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269"; }; dependencies = []; @@ -932,8 +933,18 @@ rec { name = "table-mode"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "e1258702126463b30e32a8a4cd1ba28689a93ef8"; - sha256 = "2b8ac53a0a346f27db617dade3bd3e4da7d5b560a99c636da7d27cf5622a6690"; + rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9"; + sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c"; + }; + dependencies = []; + + }; + "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tlib"; + src = fetchgit { + url = "git://github.com/tomtom/tlib_vim"; + rev = "9e629767e5a91ede057d07f8754326e68c92a692"; + sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6"; }; dependencies = []; @@ -942,11 +953,21 @@ rec { name = "undotree"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "88e4a9bc2f7916f24441faf884853a01ba11d294"; - sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; + rev = "42000e2a7140843030f517de9d4923dd5fa40458"; + sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293"; }; dependencies = []; + }; + "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-actions"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-actions"; + rev = "a5d20500fb8812958540cf17862bd73e7af64936"; + sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-async"; @@ -957,6 +978,16 @@ rec { }; dependencies = ["vim-addon-signs"]; + }; + "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-background-cmd"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "e99076519139b959edce0581b0f31207a5ec7c64"; + sha256 = "524795221ae727635fe52ead47dff452d2dd48900917da609426ea399a2eceeb"; + }; + dependencies = ["vim-addon-mw-utils"]; + }; "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-commenting"; @@ -967,6 +998,36 @@ rec { }; dependencies = []; + }; + "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-completion"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-completion"; + rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; + sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; + }; + dependencies = ["tlib"]; + + }; + "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-errorformats"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; + }; + dependencies = []; + + }; + "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-goto-thing-at-cursor"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; + }; + dependencies = ["tlib"]; + }; "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-local-vimrc"; @@ -982,8 +1043,8 @@ rec { name = "vim-addon-manager"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "345c4b357843b14f4622f212e4d1e0e3f8a7f08a"; - sha256 = "d8fba7dd089f4a919f91dc284537880d7a841c26dacb503ea08b15dce35e7626"; + rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07"; + sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be"; }; dependencies = []; @@ -1032,8 +1093,18 @@ rec { name = "vim-addon-php-manual"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; - rev = "e09ccdce3d2132771d0bd32884553207cc7122d0"; - sha256 = "b2f44be3a1ceca9de7789ea9b5fd36035b720ea529f4301f3771b010d1e453c2"; + rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; + sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd"; + }; + dependencies = []; + + }; + "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-signs"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; }; dependencies = []; @@ -1082,8 +1153,8 @@ rec { name = "vim-airline"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "4a2208821e1d334c4d3cdf66cd1fd0968755e16a"; - sha256 = "ea2d8bb459ae2cc378a46409c7e86db9b1cc8349bd3d2451c9a5db8ae9c8ea1d"; + rev = "446397e006d8cba9e1ac38d8c656ba39218c139b"; + sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119"; }; dependencies = []; @@ -1102,8 +1173,8 @@ rec { name = "vim-easy-align"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "246139c57c4a82a9787974165dfeb7bee7dacc9c"; - sha256 = "9205b94f985f633b5cbdde63a4c5a36ce5c4f92f8a89c124ff4ba66458f98cbf"; + rev = "c62d124be614de65922b15d468c4049d1eee9353"; + sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee"; }; dependencies = []; @@ -1112,8 +1183,8 @@ rec { name = "vim-gitgutter"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "88c7916d2f653e13cbbcd2c461c83c403d09ca46"; - sha256 = "df56b3cd81a71cd3a4286d878a4cfd7b53c3b7b09f3cf45fa41653050315056c"; + rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd"; + sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d"; }; dependencies = []; @@ -1142,8 +1213,8 @@ rec { name = "vim-signature"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "598a9275668d772ca18cc052246b96edcbe61de0"; - sha256 = "1c410aaec24840b0e0566cd6e6df100ca3c7fb83d92337efdfc359494b6c49f8"; + rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45"; + sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675"; }; dependencies = []; @@ -1152,8 +1223,8 @@ rec { name = "vim-snippets"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "436038094a27ed635aaa11ebf50ccddc2d4b9328"; - sha256 = "1db34df31ff1526394de42997e21b47cea152dc2c014dbbb1f3bbeb8986820e1"; + rev = "27906a3754f0ac292d0915a4075bff22db53fa3e"; + sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6"; }; dependencies = []; @@ -1194,5 +1265,4 @@ rec { }; - } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f685f6743bef..3f7e400777bf 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -12,7 +12,7 @@ "matchit.zip" "vim-addon-xdebug" "vim-addon-php-manual" -"sourcemap.vim" +"sourcemap" "vim-iced-coffee-script" "ctrlp" "commentary"