diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-07 19:26:58 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-07 20:34:26 -0700 |
commit | 8209d3f78b55847a67e12769b4566abb3fad4fa1 (patch) | |
tree | 7fb316039a88a7e7650734f80bc28b781b028c01 | |
parent | 0e4057b167702a5450da09123260f2e453f092cb (diff) | |
download | nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.tar nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.tar.gz nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.tar.bz2 nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.tar.lz nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.tar.xz nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.tar.zst nixlib-8209d3f78b55847a67e12769b4566abb3fad4fa1.zip |
kernel: 3.14.40 -> 3.14.41
-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 8b134e740064..75ab538ddf5e 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.40"; + version = "3.14.41"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1w5j53ny5vahp1ipj16x0ahjb5yj6q859jsdshblymvwrbkcr29a"; + sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fc9fca26c353..628dda0ac4b7 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.40"; - revision = "201504302118"; + { kversion = "3.14.41"; + revision = "201505072056"; branch = "stable"; - sha256 = "154ivf42ib93f8shh2b2qcqhppd1c6vbjfiazgigr006q638429i"; + sha256 = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg"; }; grsecurity_unstable = grsecPatch |