Merge pull request #13575 from steveeJ/vimpreviewpandoc

vim-plugins: init vimpreviewpandoc with python plugins and bugfixes
This commit is contained in:
Rok Garbas 2016-04-24 11:19:33 +02:00
commit 268ae334d9
3 changed files with 74 additions and 4 deletions

View file

@ -2,7 +2,7 @@
{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
, vim_configurable, vimPlugins, xkb_switch, git
, Cocoa
, Cocoa ? null
}:
let
@ -1682,4 +1682,25 @@ rec {
};
vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-pandoc-after-2015-06-01";
src = fetchgit {
url = "git://github.com/vim-pandoc/vim-pandoc-after";
rev = "4377665e5c98f29ea838deb3b942200b8dd096ef";
sha256 = "1di82bgi7sjn7lmma7g9zbdraamsy9c6g7ms6jgglfvynbbvmgg0";
};
dependencies = [];
};
vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimpreviewpandoc-2016-03-03";
src = fetchgit {
url = "git://github.com/tex/vimpreviewpandoc";
rev = "7c05b4a7bf55a361c7ac33e6e05f7965daed5889";
sha256 = "12xnnsvdsl2wc7fy537pdk6s3nfxw46g1l4xqr0fxzhz712nczk5";
};
dependencies = [];
};
}

View file

@ -68,6 +68,7 @@
"github:shougo/vimshell.vim"
"github:sjl/gundo.vim"
"github:takac/vim-hardtime"
"github:tex/vimpreviewpandoc"
"github:thinca/vim-quickrun"
"github:tomasr/molokai"
"github:tpope/vim-eunuch"
@ -77,6 +78,7 @@
"github:vim-airline/vim-airline-themes"
"github:vim-pandoc/vim-pandoc"
"github:vim-pandoc/vim-pandoc-syntax"
"github:vim-pandoc/vim-pandoc-after"
"github:vim-scripts/Colour-Sampler-Pack"
"github:vim-scripts/a.vim"
"github:vim-scripts/align"

View file

@ -2334,11 +2334,12 @@ in modules // {
blockdiag = buildPythonPackage rec {
name = "blockdiag-1.4.7";
name = "blockdiag";
version = "1.5.3";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/b/blockdiag/${name}.tar.gz";
sha256 = "0bc29sh8hj3hmhclifh1by0n6vg2pl9wkxb7fmljyw0arjas54bf";
url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
};
buildInputs = with self; [ pep8 nose unittest2 docutils ];
@ -26541,4 +26542,50 @@ in modules // {
platforms = platforms.linux;
};
};
pandocfilters = buildPythonPackage rec{
version = "1.3.0";
pname = "pandocfilters";
name = pname + "-${version}";
src = pkgs.fetchFromGitHub {
owner = "jgm";
repo = pname;
rev = version;
sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz";
};
propagatedBuildInputs = with self; [ ];
meta = {
description = "A python module for writing pandoc filters, with a collection of examples";
homepage = https://github.com/jgm/pandocfilters;
license = licenses.mit;
maintainers = with maintainers; [];
};
};
htmltreediff = buildPythonPackage rec{
version = "0.1.2";
pname = "htmltreediff";
name = pname + "-${version}";
# Does not work with Py >= 3
disabled = !isPy27;
src = pkgs.fetchFromGitHub {
owner = "christian-oudard";
repo = pname;
rev = "v" + version;
sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
};
propagatedBuildInputs = with self; [ lxml html5lib ];
meta = {
description = " Structure-aware diff for html and xml documents";
homepage = https://github.com/christian-oudard/htmltreediff;
license = licenses.bsdOriginal;
maintainers = with maintainers; [];
};
};
}