grsecurity: generate linuxPackages and declare that apparmor is included

This commit is contained in:
Ricardo M. Correia 2013-08-05 18:09:12 +00:00 committed by Evgeny Egorochkin
parent af0e2ccf45
commit 90a2341300
2 changed files with 3 additions and 0 deletions

View File

@ -137,6 +137,8 @@ rec {
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.51-201309101928.patch;
sha256 = "90f9ddc74d56f4525b8faa8505a95f45c23a2e763c7519ba5ae953069a51aca2";
};
# The grsec kernel patch seems to include the apparmor patches as of 2.9.1-3.2.51
features.apparmor = true;
};
}

View File

@ -6779,6 +6779,7 @@ let
linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0);
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor;
linuxPackages_3_2_grsecurity = linuxPackagesFor pkgs.linux_3_2_grsecurity linuxPackages_3_2_grsecurity;
linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen;
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor;