Merge master into staging-next

2020-10-14 11:32:49 +02:00
parent 9e1943edc0 ffde8a8e1e
commit b981eca057
49 changed files with 901 additions and 556 deletions
@@ -13,6 +13,7 @@
 , CoreFoundation, Security
 , llvmPackages
 , pkgsBuildTarget, pkgsBuildBuild
+, makeRustPlatform
 } @ args:

 import ./default.nix {