Merge remote-tracking branch 'master' into stdenv-updates.

Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
parent 0b8f1b1448 af98eb8de0
commit 522acfd2f4
543 changed files with 11729 additions and 9102 deletions
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -85,6 +85,7 @@ let
    passthru = {
      inherit zlibSupport;
      libPrefix = "python${majorVersion}";
+      executable = "python2.7";
    };

    enableParallelBuilding = true;