diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-11 20:10:53 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-11 20:15:05 -0700 |
| commit | 0245b287965c821f7ddf92bc230996850a492e3b (patch) | |
| tree | b0dc1913b1346652021bef18600435016d9c5ade /pkgs | |
| parent | 3284b216a4fc1a758bcfc33ca093a0ad24841430 (diff) | |
| download | nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.tar nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.tar.gz nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.tar.bz2 nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.tar.lz nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.tar.xz nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.tar.zst nixpkgs-0245b287965c821f7ddf92bc230996850a492e3b.zip | |
kernel: 3.14.47 -> 3.14.48
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 90a6a59ed4a..377f0271aea 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.47"; + version = "3.14.48"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1hh24p0axh0kn49b0rqfmb1h74a0ry1pgy0ps1hgxs5x3lxby783"; + sha256 = "098a7kjfw4jf0f7h6z57f2719jfz3y3jjlcd8y6d95xvhy7xxyw9"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2ef35db1270..a8fc0166508 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.47"; - revision = "201507050832"; + { kversion = "3.14.48"; + revision = "201507111210"; branch = "stable"; - sha256 = "0sv7aa7ca2n5jiz4j5vvji1x2p7cb1ah71h1iqmk0981dqs0isp8"; + sha256 = "0phmqlkx6vqlv79ppf6g4wsx7rwsvwpakpkm9xsq8qazffk7s9qk"; }; grsecurity_unstable = grsecPatch |