Merge branch 'staging' into closure-size

This commit is contained in:
Vladimír Čunát
2016-01-19 09:55:31 +01:00
1293 changed files with 75245 additions and 28520 deletions
@@ -5,7 +5,7 @@
}:
let
version = "1.0.6";
version = "1.1.2";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn";
sha256 = "07s6z3hbrb4rdfgzmln169wxz4nm5y7qbr02ik5c7drxpn85fb2a";
};
outputs = [ "dev" "out" ];