From 28cb0f58c473eb6622415c20c6d27a186d9696be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 16 Jul 2014 12:08:48 +0200 Subject: [PATCH] linux: only enable CONFIG_NFS_SWAP for v3.6+ kernels Linux v3.6 is the earliest version with CONFIG_NFS_SWAP support. This change unbreaks NixOS tests for older kernels. --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9050d7aa988..a4b2c221b81 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -157,7 +157,9 @@ with stdenv.lib; BTRFS_FS_POSIX_ACL y UBIFS_FS_XATTR? y UBIFS_FS_ADVANCED_COMPR? y - NFS_SWAP y + ${optionalString (versionAtLeast version "3.6") '' + NFS_SWAP y + ''} ${optionalString (versionAtLeast version "3.11") '' NFS_V4_1 y # NFSv4.1 client support NFS_V4_2 y