summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2014-01-29 14:52:18 +0100
committerRicardo M. Correia <rcorreia@wizy.org>2014-02-08 16:16:58 +0100
commitb31547654d7fd5fea0eadbae07fcae5c9dd60077 (patch)
treea3225c2ca8dcd2cdc10ae65f123690443ac323ab /pkgs/top-level/all-packages.nix
parent31fa2cd52bef42d670c569cb8951509c89c143b0 (diff)
downloadnixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.tar
nixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.tar.gz
nixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.tar.bz2
nixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.tar.lz
nixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.tar.xz
nixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.tar.zst
nixlib-b31547654d7fd5fea0eadbae07fcae5c9dd60077.zip
grsecurity: Update stable and test patches
stable: 3.0-3.2.54-201401191012 -> 3.0-3.2.54-201402062221
test:   3.0-3.12.8-201401191015 -> 3.0-3.13.2-201402062224
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6f8fe8b8dda..fd24b251b485 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6666,10 +6666,10 @@ let
     };
   })) (args: grsecurityOverrider args));
 
-  linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
+  linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_2 kernelPatches.grsec_path ];
     argsOverride = {
-      modDirVersion = "${linux_3_12.modDirVersion}-grsec";
+      modDirVersion = "${linux_3_13.modDirVersion}-grsec";
     };
   })) (args: grsecurityOverrider args));
 
@@ -6854,7 +6854,7 @@ let
   linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
   linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
-  linuxPackages_3_12_grsecurity = linuxPackagesFor pkgs.linux_3_12_grsecurity linuxPackages_3_12_grsecurity;
+  linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
   linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
   # Update this when adding a new version!
   linuxPackages_latest = pkgs.linuxPackages_3_13;