Skip to content

Commit 94fb5e3

Browse files
Merge pull request #201 from NuschtOS/zfs-latest
zfs: remove latestCompatibleKernel
2 parents 63d6ab3 + e6de561 commit 94fb5e3

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

modules/zfs.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ in
77
options = {
88
boot.zfs = {
99
recommendedDefaults = libS.mkOpinionatedOption "enable recommended ZFS settings";
10-
latestCompatibleKernel = lib.mkEnableOption "use the latest ZFS compatible kernel";
1110
};
1211
};
1312

14-
config = lib.mkIf cfg.enabled {
15-
# TODO: add srvos mixin?
16-
# https://github.com/nix-community/srvos/blob/main/nixos/mixins/latest-zfs-kernel.nix
17-
boot.kernelPackages = lib.mkIf cfg.latestCompatibleKernel (lib.mkDefault cfg.package.latestCompatibleLinuxPackages);
13+
imports = [
14+
(lib.mkRemovedOptionModule ["boot" "zfs" "latestCompatibleKernel"] ''
15+
latestCompatibleKernel has been removed because zfs.passthru.latestCompatibleLinuxPackages has been effectively removed.
16+
Consider using <https://github.com/nix-community/srvos/blob/main/nixos/mixins/latest-zfs-kernel.nix> instead.
17+
'')
18+
];
1819

20+
config = lib.mkIf cfg.enabled {
1921
services.zfs = lib.mkIf cfg.recommendedDefaults {
2022
autoScrub.enable = true;
2123
trim.enable = true;

0 commit comments

Comments
 (0)