From 1b80f2478851d7c2bec8e4732224ad6028d0e3cd Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 4 Mar 2016 14:10:17 +0100
Subject: [PATCH 1/3] vim-plugins: make Cocoa optional

---
 pkgs/misc/vim-plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0ad4db976359..83dcab35e678 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -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

From aaec8fb9f1ab299b399793fe5b86f60a7c3f8f88 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 29 Feb 2016 18:40:32 +0100
Subject: [PATCH 2/3] vim-plugins: add vimprivewpandoc and needed python
 modules

---
 pkgs/misc/vim-plugins/default.nix      | 21 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  2 ++
 pkgs/top-level/python-packages.nix     | 46 ++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 83dcab35e678..5b32a1b49ea2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -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 = [];
+
+  };
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5102d6cde1ce..2b8d71b87603 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -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"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 429acdd63473..68a71864933c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26541,4 +26541,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; [];
+    };
+  };
 }

From 31176b579227956554a8d347e0a644332951e1f2 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 5 Mar 2016 22:55:55 +0100
Subject: [PATCH 3/3] blockdiag: 1.4.7 --> 1.5.3

* version bump
* change url from pypi to bitbucket
---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68a71864933c..1232f7a58fd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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 ];