diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:41:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:41:04 -0700 |
| commit | 194357ad2036ba723bf8bd66ad250dfb19384c4b (patch) | |
| tree | 76bdc0ebf4a1cf8eb397b7476397aede9098a219 /pkgs | |
| parent | 7fccf2ea68925293a3d8f552fd6495ec45a87f54 (diff) | |
| download | nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.tar nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.tar.gz nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.tar.bz2 nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.tar.lz nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.tar.xz nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.tar.zst nixpkgs-194357ad2036ba723bf8bd66ad250dfb19384c4b.zip | |
grsecurityUnstable: 4.1.7 -> 4.2.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.1.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.2.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index f26291e7daa..3bf40a2e8d6 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_4_1 test-patch; + else mkKernel pkgs.linux_4_2 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index ba0ff2a5ede..8a1f27afb8a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "4.1.10"; - # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index a2d9b5076dd..24df9a7eb92 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -2,6 +2,7 @@ import ./generic.nix (args // rec { version = "4.2.3"; + # Remember to update grsecurity! extraMeta.branch = "4.2"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index de1b16347e1..cd34819a848 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,10 +87,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.1.7"; - revision = "201509131604"; + { kversion = "4.2.3"; + revision = "201510130858"; branch = "test"; - sha256 = "1frfyi1pkiqc3awri3sr7xv41qxc8m2kb1yhfvj6xkrwb9li2bki"; + sha256 = "0ndzcx9i94c065dlyvgykmin5bfkbydrv0kxxq52a4c9is6nlsrb"; }; grsec_fix_path = |