MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

grsecurity: fix kernel config and uncomment grsecurity kernels

Browse source
This commit is contained in:
Dan Peebles 2016-01-23 16:58:35 +00:00
parent 85f9d04319
commit 8f9aea9ccc
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/build-support/grsecurity/default.nix
View file

@ -142,6 +142,7 @@ let
};
extraConfig = grsecConfig;
features.grsecurity = true;
ignoreConfigErrors = true; # Too lazy to model the config options that work with grsecurity and don't for now
})) (args: grsecurityOverrider args grkern));
mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern);

4
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -23,6 +23,7 @@
# symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2.
kernelPatches ? []
, ignoreConfigErrors ? stdenv.platform.name != "pc"
, extraMeta ? {}
, ...
}:
@ -41,14 +42,13 @@ let
in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
configfile = stdenv.mkDerivation {
inherit ignoreConfigErrors;
name = "linux-config-${version}";
generateConfig = ./generate-config.pl;
kernelConfig = kernelConfigFun config;
ignoreConfigErrors = stdenv.platform.name != "pc";
nativeBuildInputs = [ perl ];
platformName = stdenv.platform.name;

6
pkgs/top-level/all-packages.nix
View file

@ -10321,9 +10321,9 @@ let
linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
# Testing kernels: outdated ATM
#linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
#linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server;
#linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server;
linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
# ChromiumOS kernels
linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14);