diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
| commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
| tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/os-specific/linux/kernel/linux-3.14.nix | |
| parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
| parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
| download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-3.14.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 |
1 files changed, 2 insertions, 2 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; |