From 9aee2a17af6b3b7c7a068774914bfd5ffd151020 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 28 Jul 2016 23:00:53 +0200 Subject: [PATCH] linux: 4.6.4 -> 4.6.5 Removed patch was applied upstream. --- pkgs/os-specific/linux/kernel/linux-4.6.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix index c0849942f4f..0559df72ae6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.4"; + version = "4.6.5"; extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zpz29hgwdwkil6rakn08bdq77qjcz8q18qlkfc43s84f4fd8s45"; + sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 738bf987171..759010751f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11107,7 +11107,6 @@ in linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.qat_common_Makefile kernelPatches.hiddev_CVE_2016_5829 ] ++ lib.optionals ((platform.kernelArch or null) == "mips")