diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-15 16:12:28 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-15 18:38:14 -0700 |
| commit | fcf15de248a5a88c25da0f0f18669bed89d5f1d8 (patch) | |
| tree | 777005555fd92e03430102bb95883496047b287a /pkgs/os-specific | |
| parent | 90659e27355dc88a6bcb089fe59ae40c2c9647a8 (diff) | |
| download | nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.tar nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.tar.gz nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.tar.bz2 nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.tar.lz nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.tar.xz nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.tar.zst nixpkgs-fcf15de248a5a88c25da0f0f18669bed89d5f1d8.zip | |
kernel: 3.14.41 -> 3.14.42
Diffstat (limited to 'pkgs/os-specific')
| -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 75ab538ddf5..16e46bf65c0 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.41"; + version = "3.14.42"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2"; + sha256 = "02k09ndhragz1p2mrq489fa7cgs2c2f3lwr1x0h1n94zqpsmpyip"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0c5a09a0dab..27162d50046 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.41"; - revision = "201505101121"; + { kversion = "3.14.42"; + revision = "201505141745"; branch = "stable"; - sha256 = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g"; + sha256 = "1565ggx42w0j038avz9d4pydf4j29rli2hz5wangf3vnjbhixh39"; }; grsecurity_unstable = grsecPatch |