diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-04-29 14:31:39 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-04-29 14:34:11 -0700 |
| commit | 084d1143e63f86e585c1076538154f1335e06b2a (patch) | |
| tree | 6358e3b49942ab5ecb7f07dda417ea99c6ada989 /pkgs | |
| parent | dfd7b26e3a18fdaef0b2326467465d28dccd3e66 (diff) | |
| download | nixlib-084d1143e63f86e585c1076538154f1335e06b2a.tar nixlib-084d1143e63f86e585c1076538154f1335e06b2a.tar.gz nixlib-084d1143e63f86e585c1076538154f1335e06b2a.tar.bz2 nixlib-084d1143e63f86e585c1076538154f1335e06b2a.tar.lz nixlib-084d1143e63f86e585c1076538154f1335e06b2a.tar.xz nixlib-084d1143e63f86e585c1076538154f1335e06b2a.tar.zst nixlib-084d1143e63f86e585c1076538154f1335e06b2a.zip | |
kernel: 3.14.39 -> 3.14.40
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 188eb6f699c1..8b134e740064 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.39"; + version = "3.14.40"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0zgfiqlvmprbn55k9ijf6db027mxlcww76y47g4g7vcj5qrpq6rd"; + sha256 = "1w5j53ny5vahp1ipj16x0ahjb5yj6q859jsdshblymvwrbkcr29a"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 73ae3a2c6eb8..2bb8fb570003 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.39"; - revision = "201504190814"; + { kversion = "3.14.40"; + revision = "201504290821"; branch = "stable"; - sha256 = "0pjq0ggifh6hp5y62dl0ydskpmsmzj1cxxjaaqs6fpwn5ndsdji7"; + sha256 = "0382ydr1dshjmwggx5a6ywrdr7qv52w178ify60qw59lrphbdkls"; }; grsecurity_unstable = grsecPatch |