Merge branch 'master' into unused5

This commit is contained in:
Jörg Thalheim
2018-07-21 15:41:22 +01:00
committed by GitHub
203 changed files with 1655 additions and 627 deletions
@@ -6,8 +6,7 @@
}:
let
inherit (stdenv.lib) getLib optionalString;
inherit (darwin) libiconv;
inherit (stdenv.lib) optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
bootstrapping = versionType == "bootstrap";