From cd85a704a52d3585940991f76e9c24eada7a955c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Aug 2017 03:23:30 -0400 Subject: [PATCH] linux: 4.13-rc4 -> 4.13-rc6 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++ pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index deb1d81775b..dfb5d2a43e1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -642,6 +642,10 @@ with stdenv.lib; TEST_USER_COPY? n XZ_DEC_TEST? n + ${optionalString (versionAtLeast version "4.13") '' + TEST_KMOD n + ''} + ${optionalString (versionOlder version "4.4") '' EFI_TEST? n RCU_PERF_TEST? n diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 281cc7186b6..5bbee02b9aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13-rc4"; - modDirVersion = "4.13.0-rc4"; + version = "4.13-rc6"; + modDirVersion = "4.13.0-rc6"; extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "00yiihmgifvl4bas861p87166nb1mf59b6nm5jsfk2zr27pszlyx"; + sha256 = "06jdbgihdjmq84d7km43f3w6d3hwmbnv3sgzip3nhx77l14cp7f2"; }; features.iwlwifi = true;