diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
| commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
| tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a /pkgs/os-specific/linux/zfs | |
| parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
| parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
| download | nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d382eb74b26..31b0cdfea8a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -187,9 +187,11 @@ in { spl = splUnstable; }; + # TODO: Remove this module before 18.09 + # also remove boot.zfs.enableLegacyCrypto zfsLegacyCrypto = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-02-01"; |