Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
Vladimír Čunát
2015-11-20 14:32:58 +01:00
1278 changed files with 105731 additions and 30012 deletions

View File

@@ -5,16 +5,16 @@
}:
let
version = "1.0.3";
version = "1.0.6";
inherit (stdenv.lib) optional optionals optionalString;
in
stdenv.mkDerivation {
name = "harfbuzz${optionalString withIcu "-icu"}-1.0.3";
name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b";
sha256 = "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn";
};
outputs = [ "dev" "out" ];