Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2017-06-07 18:11:27 +02:00
26 changed files with 281 additions and 275 deletions
@@ -114,8 +114,8 @@ in {
};
openssl_1_1_0 = common {
version = "1.1.0e";
sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
version = "1.1.0f";
sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj";
};
}