updating sources, fixes #103

nix-community · Jan 30, 2017 · 1bc4738 · 1bc4738
1 parent 49d7bdb
commit 1bc4738
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/default.nix b/default.nix
@@ -7,13 +7,13 @@ let
   version = builtins.readFile ./src/pypi2nix/VERSION;
 
   click = fetchurl {
-    url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
-    sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
+    url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz";
+    sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
   };
 
   requests = fetchurl {
-    url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
-    sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
+    url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz";
+    sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp";
   };
 
 in stdenv.mkDerivation rec {

diff --git a/src/pypi2nix/bootstrap.nix b/src/pypi2nix/bootstrap.nix
@@ -13,6 +13,10 @@ in
 
       mkdir index/
       cp ${deps.pipWhl} index/pip-${deps.pipVersion}-py2.py3-none-any.whl
+      cp ${deps.sixWhl} index/six-${deps.sixVersion}-py2.py3-none-any.whl
+      cp ${deps.appdirsWhl} index/appdirs-${deps.appdirsVersion}-py2.py3-none-any.whl
+      cp ${deps.packagingWhl} index/packaging-${deps.packagingVersion}-py2.py3-none-any.whl
+      cp ${deps.pyparsingWhl} index/pyparsing-${deps.pyparsingVersion}-py2.py3-none-any.whl
       cp ${deps.setuptoolsWhl} index/setuptools-${deps.setuptoolsVersion}-py2.py3-none-any.whl
       cp ${deps.wheel} index/wheel-${deps.wheelVersion}.tar.gz
       cp ${deps.zcbuildout} index/zc.buildout-${deps.zcbuildoutVersion}.tar.gz

diff --git a/src/pypi2nix/deps.nix b/src/pypi2nix/deps.nix
@@ -13,16 +13,40 @@ rec {
     sha256 = "03clr9c1dih5n9c00c592zzvf6r1ffimywkaq9agcqdllzhl7wh9";
   };
 
-  setuptoolsVersion = "32.2.0";
+  setuptoolsVersion = "34.1.0";
   setuptoolsWhl = fetchurl {
-    url = "https://pypi.python.org/packages/3a/fb/570e51a1a4b0de85eb6ec36a6c47bd5fd7a55128a1391a15b6e21d290a87/setuptools-32.2.0-py2.py3-none-any.whl";
-    sha256 = "1pyszj1bzp73dj2anpr37106bimpwyj6kqgigw0gahl7dgyzk3p1";
+    url = "https://pypi.python.org/packages/a7/62/3995dc3067cbf8d4a13ddac0f87417b9a08799c586b3faa77d62ad9085de/setuptools-34.1.0-py2.py3-none-any.whl";
+    sha256 = "1fmpshqr8lfcrnn6d4njrf9qfj86vxpjwaq06g2vjf7yhabx7ngd";
   };
 
-  zcbuildoutVersion = "2.5.3";
+  sixVersion = "1.10.0";
+  sixWhl = fetchurl {
+    url = "https://pypi.python.org/packages/c8/0a/b6723e1bc4c516cb687841499455a8505b44607ab535be01091c0f24f079/six-1.10.0-py2.py3-none-any.whl";
+    sha256 = "1cay6fbjmwz2lxrjbp543k1g2ivbm891mlx64njgbk4v7m08rxqg";
+  };
+
+  appdirsVersion = "1.4.0";
+  appdirsWhl = fetchurl {
+    url = "https://pypi.python.org/packages/7b/8b/eebc6e2002a1e0383f1c7108d0111d4d33ea93bf417d7e19e43ec9b87b2b/appdirs-1.4.0-py2.py3-none-any.whl";
+    sha256 = "0dkpa5aynxz75ydhv2f9rlpllld5q9815h89667m6acgvdw8brc5";
+  };
+
+  packagingVersion = "16.8";
+  packagingWhl = fetchurl {
+    url = "https://pypi.python.org/packages/87/1b/c39b7c65b5612812b83d6cab7ef2885eac9f6beb0b7b8a7071a186aea3b1/packaging-16.8-py2.py3-none-any.whl";
+    sha256 = "1273rw8ihdbshvm95c4ih0a7rxykbh4z2s3s08r1z1d7wg36s9wr";
+  };
+
+  pyparsingVersion = "2.1.10";
+  pyparsingWhl = fetchurl {
+    url = "https://pypi.python.org/packages/2b/f7/e5a178fc3ea4118a0edce2a8d51fc14e680c745cf4162e4285b437c43c94/pyparsing-2.1.10-py2.py3-none-any.whl";
+    sha256 = "117ys98ssg9asm4gz6dav4nm7zvrw3fbac6x6cprd4p6rrx1s437";
+  };
+
+  zcbuildoutVersion = "2.6.0";
   zcbuildout = fetchurl {
-    url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-${zcbuildoutVersion}.tar.gz";
-    sha256 = "1ffgxw8babhf68672ah1grjn06whl0plqmgwbr6605j4qvy3lpry";
+    url = "https://pypi.python.org/packages/7f/ce/a714ab788754373a55c1f110eff61d49ca1e7b41bcec505189fedce39794/zc.buildout-2.6.0.tar.gz";
+    sha256 = "0j4bfq8x2x8gp2csykh6g9sg3mazn4fzh13qcs0qvax8sh6i66rr";
   };
 
   zcrecipeeggVersion = "2.0.3";