diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-08 17:46:27 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-08 17:46:27 +0100 |
commit | 94ae555c069cad7f947b943173cda1758b5e14be (patch) | |
tree | 46fffaa32259ecab18c08a2e680eca5305b2fb6a /pkgs/top-level/all-packages.nix | |
parent | e78351cf3a4829c9eecb43af3acba0f82c07513b (diff) | |
parent | b31547654d7fd5fea0eadbae07fcae5c9dd60077 (diff) | |
download | nixlib-94ae555c069cad7f947b943173cda1758b5e14be.tar nixlib-94ae555c069cad7f947b943173cda1758b5e14be.tar.gz nixlib-94ae555c069cad7f947b943173cda1758b5e14be.tar.bz2 nixlib-94ae555c069cad7f947b943173cda1758b5e14be.tar.lz nixlib-94ae555c069cad7f947b943173cda1758b5e14be.tar.xz nixlib-94ae555c069cad7f947b943173cda1758b5e14be.tar.zst nixlib-94ae555c069cad7f947b943173cda1758b5e14be.zip |
Merge #1654: grsecurity: fix build and update
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1332cadc6461..1c542dfc3612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6661,13 +6661,17 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - modDirVersion = "${linux_3_2.version}-grsec"; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ]; + argsOverride = { + modDirVersion = "${linux_3_2.modDirVersion}-grsec"; + }; })) (args: grsecurityOverrider args)); - linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { - modDirVersion = "${linux_3_12.version}-grsec"; - 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_13.modDirVersion}-grsec"; + }; })) (args: grsecurityOverrider args)); linux_3_2_apparmor = lowPrio (linux_3_2.override { @@ -6851,7 +6855,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; |