Merge branch 'master' into staging

Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
parent 5ad9db0473 961ed7c8b4
commit b4af993c3f
151 changed files with 6654 additions and 1254 deletions
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -101,6 +101,7 @@ let
      libPrefix = "python${majorVersion}";
      executable = libPrefix;
      sitePackages = "lib/${libPrefix}/site-packages";
+      interpreter = "${self}/bin/${executable}";
    };

    enableParallelBuilding = true;