Merge master into staging-next

2021-02-09 06:16:02 +00:00
parent e95bf38429 50d34017c2
commit 30dddce5e8
101 changed files with 477 additions and 686 deletions
@@ -66,7 +66,7 @@ let
  # {pkgs, ...}:
  # {
  #   allowUnfree = false;
-  #   allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name);
+  #   allowUnfreePredicate = (x: pkgs.lib.hasPrefix "vscode" x.name);
  # }
  allowUnfreePredicate = config.allowUnfreePredicate or (x: false);