Merge staging-next into staging

2019-08-28 08:26:42 +02:00
parent a2538606e3 98640fd482
commit 5061fe0c2c
1209 changed files with 36685 additions and 18393 deletions
@@ -36,6 +36,7 @@ in

    boot.kernelPackages = mkOption {
      default = pkgs.linuxPackages;
+      type = types.unspecified // { merge = mergeEqualOption; };
      apply = kernelPackages: kernelPackages.extend (self: super: {
        kernel = super.kernel.override {
          inherit randstructSeed;