Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Frederik Rietdijk
2016-10-22 17:23:24 +02:00
221 changed files with 10778 additions and 4428 deletions

View File

@@ -14,7 +14,7 @@ let
sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
};
in stdenv.mkDerivation rec {
name = "python-${python.version}-bootstrapped-pip-${version}";
name = "${python.libPrefix}-bootstrapped-pip-${version}";
version = "8.1.2";
src = fetchurl {