summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-09-25 14:55:45 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-09-25 14:55:45 +0200
commit30ae939142f30c2cd28fd6fbf00bf3fa7fa38626 (patch)
tree1be5807ce6d4597ec834d23bf4f9239f63dda786 /pkgs/os-specific
parent5000f5050a049327999fbeea82f17266386ff125 (diff)
downloadnixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.tar
nixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.tar.gz
nixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.tar.bz2
nixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.tar.lz
nixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.tar.xz
nixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.tar.zst
nixlib-30ae939142f30c2cd28fd6fbf00bf3fa7fa38626.zip
linuxPackages.spl: don't mark as broken on kernel >= 4.7
Compatibility added in c8c688b0c950e6a4dd0713aa4f591dadb4810675.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/spl/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index c18e8f0bb354..debecef1c1b0 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -60,10 +60,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
-    broken = buildKernel
-      && (kernel.features.grsecurity or
-            # spl marked as broken until following patch is released
-            # https://github.com/zfsonlinux/spl/commit/fdbc1ba99d1f4d3958189079eee9b6c957e0264b
-            (versionAtLeast  kernel.version "4.7"));
+    broken = buildKernel && kernel.features.grsecurity;
   };
 }