From acbaefa6156b67ecbb2cd3d5d65787d21790b815 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 28 Nov 2017 15:05:19 +0200 Subject: [PATCH] Revert "linux-testing: 4.14-rc8 -> 4.15-rc1" This reverts commit 9335f1dda20cc67350ab478878a0471b6123a2ae. Doesn't compile, a working version is at #32137. --- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ed649ed6492..54e37e72130 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.15-rc1"; - modDirVersion = "4.15.0-rc1"; - extraMeta.branch = "4.15"; + version = "4.14-rc8"; + modDirVersion = "4.14.0-rc8"; + extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1l7c132qb5qjd80hga03ivssfq65brqyd95sb4rd065dqrixp20n"; + sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57a3b10ed06..ed08d4c7e8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12598,6 +12598,7 @@ with pkgs; linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu