From 3b6cb81e356fc04648bd7fc2b0390491cb6eb0ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 30 Oct 2015 14:40:53 +0100
Subject: [PATCH 1/2] python nbconvert: 4.0.0 -> 4.1.0

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 292b758b5c0b..b49a3bb8d91f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9368,12 +9368,12 @@ let
   };
 
   nbconvert = buildPythonPackage rec {
-    version = "4.0.0";
+    version = "4.1.0";
     name = "nbconvert-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz";
-      sha256 = "472ad15d1a71f1ef00c4094c11bb93638858fc89fb2c5838b3aa6b67d981b437";
+      sha256 = "e0296e45293dd127d028f678e3b6aba3f1db3283a134178bdb49eea402d4cf1c";
     };
 
     buildInputs = with self; [nose];

From 858f67d74450541974994df2f52594debbdc5dbe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 30 Oct 2015 14:41:05 +0100
Subject: [PATCH 2/2] python tabulate: init at 0.7.5

---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b49a3bb8d91f..7e96b146fb07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16665,6 +16665,29 @@ let
   #   doCheck = false;
   # };
 
+  tabulate = buildPythonPackage rec {
+    version = "0.7.5";
+    name = "tabulate-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/tabulate/${name}.tar.gz";
+      sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    # Tests: cannot import common (relative import).
+    doCheck = false;
+
+    meta = {
+      description = "Pretty-print tabular data";
+      homepage = https://bitbucket.org/astanin/python-tabulate;
+      license = licenses.mit;
+      maintainer = with maintainers; [ fridh ];
+    };
+
+  };
+
   targetcli_fb = buildPythonPackage rec {
     version = "2.1.fb33";
     name = "targetcli-fb-${version}";