From fe2468b88cbc586232a86aedf8e00facf8919219 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 7 Jul 2016 02:11:23 +0200
Subject: [PATCH] pypi2nix: 1.1.0 -> 1.2.0

---
 pkgs/development/tools/pypi2nix/default.nix |  4 +--
 pkgs/development/tools/pypi2nix/deps.nix    | 31 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 4ddd8d2aaaec..796aa56ce0b5 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -3,10 +3,10 @@
 
 let
   deps = import ./deps.nix { inherit fetchurl; };
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchurl {
     url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
-    sha256 = "0la4f0cqq089hjzwa509snkqhxvwszp5zglmb0yy1m7ins3yhg2m";
+    sha256 = "13ffr2iabl5lyqqdcrs8z37lfqw1n102bkxwfx0540hj6brvkm2v";
     
   };
 in stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix
index acfcf02dfee1..2717270a164b 100644
--- a/pkgs/development/tools/pypi2nix/deps.nix
+++ b/pkgs/development/tools/pypi2nix/deps.nix
@@ -32,6 +32,12 @@ rec {
   effectVersion = "0.10.1";
   effectHash = "6a6fd28fb44179ce01a148d4e8bdbede";
 
+  chardetVersion = "2.3.0";
+  chardetHash = "25274d664ccb5130adae08047416e1a8";
+
+  aiohttpVersion = "0.21.6";
+  aiodnsHash = "d7f63e51bc86a61d9bccca13986c3855";
+
 
   # --- wheels used to bootstrap python environment ---------------------------
 
@@ -78,4 +84,29 @@ rec {
     md5 = clickHash;
   };
 
+  # six = fetchurl {
+  #   url = "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-${sixVersion}.tar.gz";
+  #   md5 = sixHash;
+  # };
+
+  # attrs = fetchurl {
+  #   url = "https://pypi.python.org/packages/89/15/80d388d696c8c8ba14874635207aa698eb30ef1242dbb54d9eccf0e927ff/attrs-${attrsVersion}.tar.gz";
+  #   md5 = attrsHash;
+  # };
+
+  # effect = fetchurl {
+  #   url = "https://pypi.python.org/packages/09/19/bd92fe0ba6080323caffd450db65ac7a5bb2d71d9b61fe6a2751a9c3292c/effect-${effectVersion}.tar.gz";
+  #   md5 = effectHash;
+  # };
+
+  chardet = fetchurl {
+    url = "https://pypi.python.org/packages/7d/87/4e3a3f38b2f5c578ce44f8dc2aa053217de9f0b6d737739b0ddac38ed237/chardet-${chardetVersion}.tar.gz";
+    md5 = chardetHash;
+  };
+
+  aiohttp = fetchurl {
+    url = "https://pypi.python.org/packages/04/78/9faeb8b5b1d53e8c81c99764412c2225d982943e4261bba2c6f725e15fce/aiohttp-${aiohttpVersion}.tar.gz";
+    md5 = aiodnsHash;
+  };
+
 }