Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6b286fa339ab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba3ab41a6a4a
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 25, 2017

  1. vim-plugins: update

    @LnL7
    LnL7 committed Jul 25, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    slawekjaranowski Slawomir Jaranowski
    GPG key ID: 9EB80E92EB2135B1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0f536de View commit details

  2. vim-plugins: add ale

    @LnL7
    LnL7 committed Jul 25, 2017
    Copy the full SHA
    f35140f View commit details

  3. Merge pull request #27594 from LnL7/vim-updates 

    vim-plugins: update
    @LnL7
    LnL7 authored Jul 25, 2017
    Copy the full SHA
    ba3ab41 View commit details
Showing with 46 additions and 32 deletions.
  1. +33 −22 pkgs/misc/vim-plugins/default.nix
  2. +13 −10 pkgs/misc/vim-plugins/vim-plugin-names
55 changes: 33 additions & 22 deletions pkgs/misc/vim-plugins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -363,17 +363,6 @@ rec {

};

forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "forms-2012-11-28";
src = fetchgit {
url = "git://github.com/megaannum/forms";
rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
};
dependencies = ["self"];

};

fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "fugitive-2017-07-12";
src = fetchgit {
@@ -1129,6 +1118,28 @@ rec {

};

forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "forms-2012-11-28";
src = fetchgit {
url = "https://github.com/megaannum/forms";
rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
};
dependencies = ["self"];

};

self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "self-2014-05-28";
src = fetchgit {
url = "https://github.com/megaannum/self";
rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
};
dependencies = [];

};

vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-startify-2017-06-15";
src = fetchgit {
@@ -1778,6 +1789,17 @@ rec {

};

ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ale-2017-07-23";
src = fetchgit {
url = "https://github.com/w0rp/ale";
rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280";
sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h";
};
dependencies = [];

};

vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-wakatime-2017-07-03";
src = fetchgit {
@@ -1943,17 +1965,6 @@ rec {

};

self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "self-2014-05-28";
src = fetchgit {
url = "git://github.com/megaannum/self";
rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
};
dependencies = [];

};

sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "sensible-2017-05-09";
src = fetchgit {
23 changes: 13 additions & 10 deletions pkgs/misc/vim-plugins/vim-plugin-names
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"CSApprox"
"CheckAttach"
"Gist"
"gruvbox"
"Hoogle"
"Solarized"
"Supertab"
@@ -16,8 +15,8 @@
"YankRing"
"clang_complete"
"commentary"
"ctrlp-py-matcher"
"ctrlp-cmatcher"
"ctrlp-py-matcher"
"ctrlp-z"
"extradite"
"fugitive"
@@ -27,8 +26,8 @@
"github:LnL7/vim-nix"
"github:Quramy/tsuquyomi"
"github:Shougo/deoplete.nvim"
"github:albfan/nerdtree-git-plugin"
"github:ajh17/Spacegray.vim"
"github:albfan/nerdtree-git-plugin"
"github:alvan/vim-closetag"
"github:ap/vim-css-color"
"github:bbchung/clighter8"
@@ -45,6 +44,7 @@
"github:dleonard0/pony-vim-syntax"
"github:dracula/vim"
"github:eagletmt/neco-ghc"
"github:editorconfig/editorconfig-vim"
"github:eikenb/acp"
"github:elixir-lang/vim-elixir"
"github:elmcast/elm-vim"
@@ -57,6 +57,7 @@
"github:floobits/floobits-neovim"
"github:frigoeu/psc-ide-vim"
"github:google/vim-jsonnet"
"github:heavenshell/vim-jsdoc"
"github:hecal3/vim-leader-guide"
"github:idris-hackers/idris-vim"
"github:itchyny/calendar.vim"
@@ -67,6 +68,7 @@
"github:jceb/vim-orgmode"
"github:jeetsukumaran/vim-buffergator"
"github:jgdavey/tslime.vim"
"github:jiangmiao/auto-pairs"
"github:jistr/vim-nerdtree-tabs"
"github:jnurmine/zenburn"
"github:jonbri/vim-colorstepper"
@@ -85,6 +87,8 @@
"github:lyokha/vim-xkbswitch"
"github:machakann/vim-highlightedyank"
"github:martinda/Jenkinsfile-vim-syntax"
"github:megaannum/forms"
"github:megaannum/self"
"github:mhinz/vim-startify"
"github:michaeljsmith/vim-indent-object"
"github:mileszs/ack.vim"
@@ -93,6 +97,7 @@
"github:nathanaelkane/vim-indent-guides"
"github:nbouscal/vim-stylish-haskell"
"github:neovimhaskell/haskell-vim"
"github:nixprime/cpsm"
"github:osyo-manga/shabadou.vim"
"github:osyo-manga/vim-watchdogs"
"github:plasticboy/vim-markdown"
@@ -102,8 +107,8 @@
"github:rhysd/vim-grammarous"
"github:rodjek/vim-puppet"
"github:rust-lang/rust.vim"
"github:sebastianmarkow/deoplete-rust"
"github:sbdchd/neoformat"
"github:sebastianmarkow/deoplete-rust"
"github:sheerun/vim-polyglot"
"github:shougo/neco-vim"
"github:shougo/neocomplete.vim"
@@ -134,20 +139,22 @@
"github:vim-scripts/Rename"
"github:vim-scripts/ReplaceWithRegister"
"github:vim-scripts/a.vim"
"github:vim-scripts/argtextobj.vim"
"github:vim-scripts/align"
"github:vim-scripts/argtextobj.vim"
"github:vim-scripts/changeColorScheme.vim"
"github:vim-scripts/random.vim"
"github:vim-scripts/tabmerge"
"github:vim-scripts/wombat256.vim"
"github:w0rp/ale"
"github:wakatime/vim-wakatime"
"github:wincent/command-t"
"github:xolox/vim-easytags"
"github:xolox/vim-misc"
"github:zah/nim.vim"
"github:zchee/deoplete-jedi"
"github:zchee/deoplete-go"
"github:zchee/deoplete-jedi"
"goyo"
"gruvbox"
"matchit.zip"
"pathogen"
"quickfixstatus"
@@ -196,7 +203,3 @@
"vimwiki"
"vinegar"
"vundle"
"github:jiangmiao/auto-pairs"
"github:editorconfig/editorconfig-vim"
"github:heavenshell/vim-jsdoc"
"github:nixprime/cpsm"