diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-06-06 09:24:11 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-06-06 10:07:43 +0100 |
| commit | 11b8a5f20e6cb7c3609638ac94a0a446e8d67aee (patch) | |
| tree | 0402b44252f0f894763142e5bd4805c980dad85a /nixos/modules/tasks/filesystems/zfs.nix | |
| parent | 2cca7180c181383cb3cd1335d365f752638deb80 (diff) | |
| download | nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.tar nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.tar.gz nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.tar.bz2 nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.tar.lz nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.tar.xz nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.tar.zst nixpkgs-11b8a5f20e6cb7c3609638ac94a0a446e8d67aee.zip | |
zfs: 0.7.13 -> 0.8.0
Same as zfsUnstable for the moment. We still keep the zfsUnstable expression as we likely need it in the near future again. Also remove spl since it is no longer needed.
Diffstat (limited to 'nixos/modules/tasks/filesystems/zfs.nix')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 37a19fb9fc8..93bbd141284 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,11 +24,9 @@ let kernel = config.boot.kernelPackages; packages = if config.boot.zfs.enableUnstable then { - spl = null; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; } else { - spl = kernel.spl; zfs = kernel.zfs; zfsUser = pkgs.zfs; }; @@ -325,8 +323,8 @@ in virtualisation.lxd.zfsSupport = true; boot = { - kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; - extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl; + kernelModules = [ "zfs" ]; + extraModulePackages = with packages; [ zfs ]; }; boot.initrd = mkIf inInitrd { |