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
@@ -40,7 +40,7 @@
}:
let
inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
inherit (stdenv) is64bit isMips isDarwin isCygwin;
inherit (stdenv.lib) enableFeature optional optionals;
in