1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index c0e5ae0ec77..dfa5f86944a 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,13 +9,17 @@ let
     url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl";
     sha256 = "0801e6d862ca4ce24d918420d62f07ee2fe736dc016e3afa99d2103e7a02e9a6";
   };
+  argparse_source = fetchurl {
+    url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
+    sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
+  };
 in stdenv.mkDerivation rec {
   name = "python-${python.version}-bootstrapped-pip-${version}";
-  version = "8.0.2";
+  version = "8.1.1";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl";
-    sha256 = "249a6f3194be8c2e8cb4d4be3f6fd16a9f1e3336218caffa8e7419e3816f9988";
+    sha256 = "0p62v87lm595kwmxrnqxc81dr7h6maaxj1y28b00bf9ag11c7fa4";
   };
 
   unpackPhase = ''
@@ -23,8 +27,11 @@ in stdenv.mkDerivation rec {
     unzip -d $out/${python.sitePackages} $src
     unzip -d $out/${python.sitePackages} ${setuptools_source}
     unzip -d $out/${python.sitePackages} ${wheel_source}
+  '' + stdenv.lib.optionalString (python.isPy26 or false) ''
+    unzip -d $out/${python.sitePackages} ${argparse_source}
   '';
 
+
   patchPhase = ''
     mkdir -p $out/bin
   '';
@@ -34,7 +41,9 @@ in stdenv.mkDerivation rec {
   installPhase = ''
 
     # install pip binary
-    echo '${python.interpreter} -m pip "$@"' > $out/bin/pip
+    echo '#!${python.interpreter}' > $out/bin/pip
+    echo 'import sys;from pip import main' >> $out/bin/pip
+    echo 'sys.exit(main())' >> $out/bin/pip
     chmod +x $out/bin/pip
 
     # wrap binaries with PYTHONPATH