Merge branch 'master' into stdenv-updates

Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
parent 3e3f70713f f8f9f3b1cc
commit fde3526e7d
352 changed files with 5595 additions and 587 deletions
@@ -25,6 +25,8 @@ stdenv.mkDerivation (rec {

  #doCheck = true; # report: No suitable file for testing purposes

+  enableParallelBuilding = true;
+
  meta = {
    description = "MIT Kerberos 5";
    homepage = webpage;