Merge pull request #14123 from LnL7/python-bootstrapped-pip

expose bootstrapped-pip in pythonPackages
This commit is contained in:
Domen Kožar 2016-03-22 20:16:20 +00:00
commit f66a369421

View File

@ -15,8 +15,10 @@ let
callPackage = pkgs.newScope self; callPackage = pkgs.newScope self;
buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic {
bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic {
inherit bootstrapped-pip;
}); });
buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args );
@ -40,7 +42,7 @@ let
in modules // { in modules // {
inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication; inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication;
# helpers # helpers