Merge branch 'master' into staging-next

2021-01-10 23:24:33 +01:00
parent 76394e4624 581232454f
commit dd72357155
298 changed files with 746 additions and 415 deletions
@@ -20,7 +20,7 @@ let
  timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;

  isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
-  optional = pkgs.stdenv.lib.optionalString;
+  optional = pkgs.lib.optionalString;

  configTxt =
    pkgs.writeText "config.txt" (''