diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-03 11:01:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-03 11:01:57 +0000 |
| commit | 696d85a62d8418e8b33f5f95b932b82706f8d338 (patch) | |
| tree | 7afed180c5eb396a567c5a20a4a59859299c6f14 /pkgs/misc | |
| parent | 5df521abdabe5d294811b9824a5839b1ebbd3127 (diff) | |
| parent | b8755a4cdf8dd426ac642c006825d302dfe5f4b1 (diff) | |
| download | nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.gz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.bz2 nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.lz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.xz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.zst nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index fa09d1ca92b9..b219e625033d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -464,6 +464,17 @@ rec { }; + vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsonnet-2016-01-21"; + src = fetchgit { + url = "git://github.com/google/vim-jsonnet"; + rev = "5d59d0ba6af2bca4484909e02d72c96fbdd5b220"; + sha256 = "eb7508aedce86bdcb7f104f62490b92bea6e23fb14fafacd251c6aab80aece78"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "idris-vim-2016-01-29"; src = fetchgit { @@ -552,6 +563,17 @@ rec { }; + zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zenburn-2015-09-18"; + src = fetchgit { + url = "git://github.com/jnurmine/zenburn"; + rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179"; + sha256 = "05d7c348dfaf70b8068abb3eaba3bc961b060e4d7a4c99fb6c4538fba5085ad1"; + }; + dependencies = []; + + }; + vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-colorstepper-2016-01-28"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 88e9bbb95944..69a6682e691c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -32,6 +32,7 @@ "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:flazz/vim-colorschemes" +"github:google/vim-jsonnet" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" "github:itchyny/thumbnail.vim" @@ -41,6 +42,7 @@ "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" "github:jistr/vim-nerdtree-tabs" +"github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" "github:junegunn/limelight.vim" @@ -96,6 +98,7 @@ "surround" "table-mode" "taglist" +"tlib" "undotree" "vim-addon-async" "vim-addon-commenting" |