pypi2nix: 1.2.0 -> 1.3.0

2 files changed, 20 insertions, 16 deletions

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 796aa56ce0b..108688b782a 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -3,15 +3,23 @@
 
 let
   deps = import ./deps.nix { inherit fetchurl; };
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchurl {
     url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
-    sha256 = "13ffr2iabl5lyqqdcrs8z37lfqw1n102bkxwfx0540hj6brvkm2v";
+    sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8";
     
   };
 in stdenv.mkDerivation rec {
   name = "pypi2nix-${version}";
-  srcs = with deps; [ src pip click setuptools zcbuildout zcrecipeegg ];
+  srcs = with deps; [
+    src
+    pip
+    click
+    setuptools
+    zcbuildout
+    zcrecipeegg
+    requests
+  ];  # six attrs effect ];
   buildInputs = [ python zip makeWrapper ];
   sourceRoot = ".";
 
@@ -23,6 +31,10 @@ in stdenv.mkDerivation rec {
     mv setuptools-*/setuptools          $out/pkgs/setuptools
     mv zc.buildout-*/src/zc             $out/pkgs/zc
     mv zc.recipe.egg-*/src/zc/recipe    $out/pkgs/zc/recipe
+    # mv six-*/six.py                    $out/pkgs/
+    # mv attrs-*/src/attr                $out/pkgs/attrs
+    # mv effect-*/effect                 $out/pkgs/effect
+    mv requests-*/requests              $out/pkgs/
 
     if [ "$IN_NIX_SHELL" != "1" ]; then
       if [ -e git-export ]; then
diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix
index 2717270a164..5d6f23c26c0 100644
--- a/pkgs/development/tools/pypi2nix/deps.nix
+++ b/pkgs/development/tools/pypi2nix/deps.nix
@@ -32,11 +32,8 @@ rec {
   effectVersion = "0.10.1";
   effectHash = "6a6fd28fb44179ce01a148d4e8bdbede";
 
-  chardetVersion = "2.3.0";
-  chardetHash = "25274d664ccb5130adae08047416e1a8";
-
-  aiohttpVersion = "0.21.6";
-  aiodnsHash = "d7f63e51bc86a61d9bccca13986c3855";
+  requestsVersion = "2.10.0";
+  requestsHash = "a36f7a64600f1bfec4d55ae021d232ae";
 
 
   # --- wheels used to bootstrap python environment ---------------------------
@@ -99,14 +96,9 @@ rec {
   #   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;
+  requests = fetchurl {
+    url = "https://pypi.python.org/packages/49/6f/183063f01aae1e025cf0130772b55848750a2f3a89bfa11b385b35d7329d/requests-${requestsVersion}.tar.gz";
+    md5 = requestsHash;
   };
 
 }