summary refs log tree commit diff
path: root/pkgs/build-support/grsecurity
diff options
context:
space:
mode:
authortg(x) <*@tg-x.net>2016-02-27 16:33:18 +0100
committertg(x) <*@tg-x.net>2016-02-27 18:36:12 +0100
commit75479605463a0319fa6af0dcd64c833138d38198 (patch)
tree23481bae022b74b04d03e9176e735b30a1adc601 /pkgs/build-support/grsecurity
parentd95321b83e7c1a1d74cb62f0c5d98f3b110ee163 (diff)
downloadnixpkgs-75479605463a0319fa6af0dcd64c833138d38198.tar
nixpkgs-75479605463a0319fa6af0dcd64c833138d38198.tar.gz
nixpkgs-75479605463a0319fa6af0dcd64c833138d38198.tar.bz2
nixpkgs-75479605463a0319fa6af0dcd64c833138d38198.tar.lz
nixpkgs-75479605463a0319fa6af0dcd64c833138d38198.tar.xz
nixpkgs-75479605463a0319fa6af0dcd64c833138d38198.tar.zst
nixpkgs-75479605463a0319fa6af0dcd64c833138d38198.zip
grsecurity: move version information to one place
Diffstat (limited to 'pkgs/build-support/grsecurity')
-rw-r--r--pkgs/build-support/grsecurity/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index f58d98933d4..77b947f906e 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -22,18 +22,18 @@ let
 
   vals = rec {
 
-    mkKernel = kernel: patch:
-      assert patch.kversion == kernel.version;
-        { inherit kernel patch;
-          inherit (patch) grversion revision;
+    mkKernel = patch:
+        {
+          inherit patch;
+          inherit (patch) kernel grversion revision;
         };
 
-    test-patch = with pkgs.kernelPatches; grsecurity_unstable;
+    test-patch = with pkgs.kernelPatches; grsecurity_testing;
     stable-patch = with pkgs.kernelPatches; grsecurity_stable;
 
     grKernel = if cfg.stable
-               then mkKernel pkgs.linux_3_14 stable-patch
-               else mkKernel pkgs.linux_4_4 test-patch;
+               then mkKernel stable-patch
+               else mkKernel test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------