diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-03-31 14:37:08 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-03-31 14:37:51 -0400 |
| commit | 9ba43c07cb96804db91185494993d9a095353527 (patch) | |
| tree | 095a118523db1b7a7b29847d82458b76285ead4e /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 05bed043b77b3c726bd419795ffc3382b8f9d2e6 (diff) | |
| download | nixpkgs-9ba43c07cb96804db91185494993d9a095353527.tar nixpkgs-9ba43c07cb96804db91185494993d9a095353527.tar.gz nixpkgs-9ba43c07cb96804db91185494993d9a095353527.tar.bz2 nixpkgs-9ba43c07cb96804db91185494993d9a095353527.tar.lz nixpkgs-9ba43c07cb96804db91185494993d9a095353527.tar.xz nixpkgs-9ba43c07cb96804db91185494993d9a095353527.tar.zst nixpkgs-9ba43c07cb96804db91185494993d9a095353527.zip | |
linux: 5.0-rc8 -> 5.1-rc2
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 18911044579..ea73a4251f0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -240,7 +240,7 @@ let FANOTIFY = yes; TMPFS = yes; TMPFS_POSIX_ACL = yes; - FS_ENCRYPTION = { optional = true; tristate = whenAtLeast "4.9" "m"; }; + FS_ENCRYPTION = if (versionAtLeast version "5.1") then yes else whenAtLeast "4.9" (option module); EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; |