pypi2nix: 1.0.0 -> 1.1.0

2 files changed, 37 insertions, 20 deletions

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 74c537763da..4ddd8d2aaae 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.0.0";
+  version = "1.1.0";
   src = fetchurl {
     url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
-    sha256 = "1rbwkmsllg8wxv45xyvc3vh97na0zxxydcfqrvig496xkylvw2rn";
+    sha256 = "0la4f0cqq089hjzwa509snkqhxvwszp5zglmb0yy1m7ins3yhg2m";
     
   };
 in stdenv.mkDerivation rec {
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   commonPhase = ''
     mkdir -p $out/bin
 
-    echo "#!${python}/bin/python"  >  $out/bin/pypi2nix
+    echo "#!${python}/bin/python3"       >  $out/bin/pypi2nix
     echo "import pypi2nix.cli"          >> $out/bin/pypi2nix
     echo "pypi2nix.cli.main()"          >> $out/bin/pypi2nix
 
@@ -64,6 +64,7 @@ in stdenv.mkDerivation rec {
     export PATH=$out/bin:$PATH
     export PYTHONPATH=`pwd`/src:$PYTHONPATH
   '';
+
   meta = {
     homepage = https://github.com/garbas/pypi2nix;
     description = "A tool that generates nix expressions for your python packages, so you don't have to.";
diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix
index 2243dd78185..acfcf02dfee 100644
--- a/pkgs/development/tools/pypi2nix/deps.nix
+++ b/pkgs/development/tools/pypi2nix/deps.nix
@@ -1,17 +1,18 @@
-{ fetchurl }:
+{ fetchurl
+}:
 
 rec {
 
-  pipVersion = "8.1.1";
-  pipHash = "6b86f11841e89c8241d689956ba99ed7";
-  pipWhlHash = "22db7b6a517a09c29d54a76650f170eb";
+  pipVersion = "8.1.2";
+  pipHash = "87083c0b9867963b29f7aba3613e8f4a";
+  pipWhlHash = "0570520434c5b600d89ec95393b2650b";
 
-  setuptoolsVersion = "21.0.0";
-  setuptoolsHash = "81964fdb89534118707742e6d1a1ddb4";
-  setuptoolsWhlHash = "6027400d6870a7dad29952b7d2dfdc7b";
+  setuptoolsVersion = "23.0.0";
+  setuptoolsHash = "100a90664040f8ff232fbac02a4c5652";
+  setuptoolsWhlHash = "a066fd7bfb8faaad763acbdbcb290199";
 
-  zcbuildoutVersion = "2.5.1";
-  zcbuildoutHash = "c88947a3c021ee1509a331c4fa9be187";
+  zcbuildoutVersion = "2.5.2";
+  zcbuildoutHash = "06a21fb02528c07aa0db31de0389a244";
 
   zcrecipeeggVersion = "2.0.3";
   zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";
@@ -22,43 +23,58 @@ rec {
   clickVersion = "6.6";
   clickHash = "d0b09582123605220ad6977175f3e51d";
 
+  sixVersion = "1.10.0";
+  sixHash = "34eed507548117b2ab523ab14b2f8b55";
+
+  attrsVersion = "16.0.0";
+  attrsHash = "5bcdd418f6e83e580434c63067c08a73";
+
+  effectVersion = "0.10.1";
+  effectHash = "6a6fd28fb44179ce01a148d4e8bdbede";
+
+
+  # --- wheels used to bootstrap python environment ---------------------------
+
   pipWhl = fetchurl {
-    url = "https://pypi.python.org/packages/31/6a/0f19a7edef6c8e5065f4346137cc2a08e22e141942d66af2e1e72d851462/pip-${pipVersion}-py2.py3-none-any.whl";
+    url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${pipVersion}-py2.py3-none-any.whl";
     md5 = pipWhlHash;
   };
 
   setuptoolsWhl = fetchurl {
-    url = "https://pypi.python.org/packages/15/b7/a76624e5a3b18c8c1c8d33a5240b34cdabb08aef2da44b536a8b53ba1a45/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl";
+    url = "https://pypi.python.org/packages/74/7c/c75c4f4032a4627406db06b742cdc7ba24c4833cd423ea7e22882380abde/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl";
     md5 = setuptoolsWhlHash;
   };
 
+
+  # --- python packages needed ------------------------------------------------
+
   pip = fetchurl {
-    url = "mirror://pypi/p/pip/pip-${pipVersion}.tar.gz";
+    url = "https://pypi.python.org/packages/e7/a8/7556133689add8d1a54c0b14aeff0acb03c64707ce100ecd53934da1aa13/pip-${pipVersion}.tar.gz";
     md5 = pipHash;
   };
 
   setuptools = fetchurl {
-    url = "mirror://pypi/s/setuptools/setuptools-${setuptoolsVersion}.tar.gz";
+    url = "https://pypi.python.org/packages/45/5e/79ca67a0d6f2f42bfdd9e467ef97398d6ad87ee2fa9c8cdf7caf3ddcab1e/setuptools-${setuptoolsVersion}.tar.gz";
     md5 = setuptoolsHash;
   };
 
   zcbuildout = fetchurl {
-    url = "mirror://pypi/z/zc.buildout/zc.buildout-${zcbuildoutVersion}.tar.gz";
+    url = "https://pypi.python.org/packages/ec/a1/60214738d5dcb199ad97034ecf349d18f3ab69659df827a5e182585bfe48/zc.buildout-${zcbuildoutVersion}.tar.gz";
     md5 = zcbuildoutHash;
   };
 
   zcrecipeegg = fetchurl {
-    url = "mirror://pypi/z/zc.recipe.egg/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";
+    url = "https://pypi.python.org/packages/08/5e/ade683d229d77ed457017145672f1be4fd98be60f1a5344109a4e66a7d54/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";
     md5 = zcrecipeeggHash;
   };
 
   wheel = fetchurl {
-    url = "mirror://pypi/w/wheel/wheel-${wheelVersion}.tar.gz";
+    url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-${wheelVersion}.tar.gz";
     md5 = wheelHash;
   };
 
   click = fetchurl {
-    url = "mirror://pypi/c/click/click-${clickVersion}.tar.gz";
+    url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-${clickVersion}.tar.gz";
     md5 = clickHash;
   };