diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:59:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:59:07 +0100 |
| commit | cbd2305d4dad93142e4fa17ca7935c6d215d981f (patch) | |
| tree | faf2ca2dda19a66aec3a9c7d39d5a3f49e58b1d0 /pkgs/os-specific | |
| parent | d2688fd6955ae3d215a684bd86777515fc644349 (diff) | |
| parent | f9c96df1d5d8cf6db264c41cb2de227636381203 (diff) | |
| download | nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.gz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.bz2 nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.lz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.xz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.zst nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e0e328566c8e..182414720111 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -61,16 +61,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.25"; - revision = "201411231452"; + revision = "201411260106"; branch = "stable"; - sha256 = "033i7lgc0qp63d772xgikb3bh9hp78xapdaqwi85lgbzi39ak2gz"; + sha256 = "19131hkbf8zrqq31iiw99hslb5g29yqfl67jzlc4y4c8092s7fdm"; }; grsecurity_unstable = grsecPatch { kversion = "3.17.4"; - revision = "201411231452"; + revision = "201411260107"; branch = "test"; - sha256 = "1ns8im11lbqyvk2kmaz88ymw1b1ni1h4byb763rbrnxclrid1f2d"; + sha256 = "1ynwmgm5c2fcd2dr76s3sqap3bv9b04p7qvf92pa1p4hgj2lva2n"; }; grsec_fix_path = |