Merge master into staging-next

2021-04-02 18:14:54 +00:00
parent 60739e07d2 9d9a1339b8
commit b3a0328b7f
82 changed files with 2602 additions and 1381 deletions
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
    CONFIG_HS20=y
    CONFIG_ACS=y
    CONFIG_GETRANDOM=y
+    CONFIG_SAE=y
  '' + lib.optionalString (sqlite != null) ''
    CONFIG_SQLITE=y
  '';