summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-07-16 12:08:48 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-07-16 12:13:06 +0200
commit28cb0f58c473eb6622415c20c6d27a186d9696be (patch)
treed05256db7978124e8a8a8c7fc712b67df23261e9 /pkgs
parent9d457ec22858d61de63232807d049ca97ad82768 (diff)
downloadnixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.tar
nixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.tar.gz
nixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.tar.bz2
nixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.tar.lz
nixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.tar.xz
nixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.tar.zst
nixlib-28cb0f58c473eb6622415c20c6d27a186d9696be.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 9050d7aa9886..a4b2c221b81a 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