Merge remote-tracking branch 'origin/master' into stdenv-updates

2012-12-04 17:12:35 +01:00
parent c138356805 50e7ddbdca
commit 5e256ccc88
391 changed files with 2094 additions and 19973 deletions
@@ -8,7 +8,16 @@ stdenv.mkDerivation rec {
    sha256 = "0rcay0wci2kiwil2h505b674cblmn4nq8pqw9g9pgqmaqjq6f711";
  };

-  doCheck = true;
+  /* FIXME: Tests currently fail on Darwin:
+
+       building test scripts for ed-1.5...
+       testing ed-1.5...
+       *** Output e1.o of script e1.ed is incorrect ***
+       *** Output r3.o of script r3.ed is incorrect ***
+       make: *** [check] Error 127
+
+    */
+  doCheck = !stdenv.isDarwin;

  crossAttrs = {
    compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];