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
+1 -1
View File
@@ -7,7 +7,7 @@
assert stdenv.isDarwin -> ApplicationServices != null;
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {