Merge master into staging-next

2021-02-12 18:16:46 +00:00
parent 15db604744 e9b66b96cc
commit b23b455f9a
71 changed files with 16848 additions and 304 deletions
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -35,6 +35,8 @@ in linux.override {
      '';
    };

+    extraMeta.broken = true;
+
    passthru.updateScript = ./update-libre.sh;

    maintainers = [ lib.maintainers.qyliss ];