From 280f0db6a0cbb4c45f28a5de7ffa8a775815b684 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 25 Jun 2017 09:18:56 -0400 Subject: [PATCH] Revert "Revert "linux: 4.9.33 -> 4.9.34"" This reverts commit 0ee624c20844c89c60a31de39a500de45a65d966. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06da769339b7..8ad74bc9ffe4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -579,7 +579,7 @@ with stdenv.lib; FW_LOADER_USER_HELPER_FALLBACK? n # Disable various self-test modules that have no use in a production system - ${optionalString (versionOlder version "4.11") '' + ${optionalString (versionOlder version "4.9") '' ARM_KPROBES_TEST? n ''} diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 521f53e309ba..38d63a22f70d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.33"; + version = "4.9.34"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d2cai3bq1bkmisbsl6l27di765xmzn3lscwray30ldbssijpjpm"; + sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k"; }; kernelPatches = args.kernelPatches;