diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-04 15:32:43 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-04 15:32:43 -0700 |
| commit | 926f073f55e7b662dcc26165465267c373c8d17e (patch) | |
| tree | 734d46d92e48777ef981179c628e3a03a81223fd /pkgs/build-support | |
| parent | f6dfaee6f573f8224ec743b8a785713cc674f974 (diff) | |
| parent | 04f1b451d71cf16fd911e645afdaa381bbd861f0 (diff) | |
| download | nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.gz nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.bz2 nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.lz nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.xz nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.zst nixlib-926f073f55e7b662dcc26165465267c373c8d17e.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 0fd3df6d5f5f..713f4cdc83e8 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_0 test-patch; + else mkKernel pkgs.linux_4_1 test-patch; ## -- grsecurity configuration --------------------------------------------- |