From 974b9cc8ccfbf3f704e331dc9070b5a9566d7201 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 10 Aug 2015 23:31:31 -0700 Subject: [PATCH] kernel: 4.1.4 -> 4.1.5 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index e8534656349..6c0ba082e36 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.4"; + version = "4.1.5"; # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17whsim5l9i486y5kchfpm9jhbr9lak4a1gdqygp5kwfrfyz5qiy"; + sha256 = "0v40vhcs3hkjw7gl71jq03ziz93cfh3vlpn686kc9y1nnbcxks5j"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f3e33047e8b..8603ccb82c7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.1.4"; - revision = "201508032312"; + { kversion = "4.1.5"; + revision = "201508102129"; branch = "test"; - sha256 = "16p1wq98qgwksav0ry6b5jyyi26s404v1k0cwpj7l7n86hxig67i"; + sha256 = "1pc40xd7k0fzzd99lshy58gnapv701hjvc4bm0slfzagh241545a"; }; grsec_fix_path =