Merge master into staging-next

2021-05-14 00:58:11 +00:00
parent 39e3f7c2cc 7cd876f22d
commit bf5d8bb531
89 changed files with 2361 additions and 2905 deletions
@@ -103,6 +103,7 @@ in
        readOnly = true;
        type = types.package;
        default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs;
+        defaultText = "if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs";
        description = "Configured ZFS userland tools package.";
      };