Merge recent master into staging

Hydra: ?compare=1150594
This commit is contained in:
Vladimír Čunát
2014-09-06 16:51:14 +02:00
140 changed files with 5000 additions and 2572 deletions

View File

@@ -82,8 +82,8 @@ let version = "4.8.3";
# Antlr (optional) allows the Java `gjdoc' tool to be built. We want a
# binary distribution here to allow the whole chain to be bootstrapped.
javaAntlr = fetchurl {
url = http://www.antlr.org/download/antlr-3.1.3.jar;
sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
url = http://www.antlr.org/download/antlr-4.4-complete.jar;
sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
};
xlibs = [