diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2013-08-05 18:09:12 +0000 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-10-20 08:14:28 +0300 |
| commit | 90a234130076f425d38588d101370ff975805a2b (patch) | |
| tree | 0cef6302c22cab71661eba22fa3c7c74fc2953ea /pkgs | |
| parent | af0e2ccf45126ed0fb1999287b6af7bfac57a820 (diff) | |
| download | nixlib-90a234130076f425d38588d101370ff975805a2b.tar nixlib-90a234130076f425d38588d101370ff975805a2b.tar.gz nixlib-90a234130076f425d38588d101370ff975805a2b.tar.bz2 nixlib-90a234130076f425d38588d101370ff975805a2b.tar.lz nixlib-90a234130076f425d38588d101370ff975805a2b.tar.xz nixlib-90a234130076f425d38588d101370ff975805a2b.tar.zst nixlib-90a234130076f425d38588d101370ff975805a2b.zip | |
grsecurity: generate linuxPackages and declare that apparmor is included
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 73533104ca9a..d642c139f6ec 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 425adf2be438..2790b1796840 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |