From 43913c8148157fd1157355a1994b1e39d4b82597 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 16 Sep 2016 17:27:32 +0200 Subject: hardware/t100ha: Pin kernel to Linux 4.7 Kernel 4.8 currently has an Intel GFX regression right now, so let's keep it at kernel 4.7 until we have properly bisected the issue and/or have a fix for this. Signed-off-by: aszlig Upstream issue: https://bugs.freedesktop.org/show_bug.cgi?id=97529 --- modules/hardware/t100ha/default.nix | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'modules/hardware') diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix index 87f5011d..90385327 100644 --- a/modules/hardware/t100ha/default.nix +++ b/modules/hardware/t100ha/default.nix @@ -8,21 +8,9 @@ in { options.vuizvui.hardware.t100ha.enable = lib.mkEnableOption desc; config = lib.mkIf cfg.enable { - # It's a CherryTrail SoC, so we want to have the latest and greatest with a - # few additional patches: boot.kernelPackages = let nixpkgs = import ../../../nixpkgs-path.nix; - mkKernel = import "${nixpkgs}/pkgs/os-specific/linux/kernel/generic.nix"; - t100haKernel = mkKernel rec { - version = "4.7"; - modDirVersion = "4.7.0"; - extraMeta.branch = "4.7"; - - src = pkgs.fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "042z53ik3mqaqlfrn5b70kw882fwd42zanqld10s1vcs438w742i"; - }; - + t100haKernel = pkgs.linux_4_7.override { kernelPatches = [ { name = "backlight"; patch = ./backlight.patch; @@ -79,14 +67,6 @@ in { INTEL_MEI y INTEL_MEI_TXE y ''; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - - inherit (pkgs) stdenv perl buildLinux; }; self = pkgs.linuxPackagesFor t100haKernel self; in self; -- cgit 1.4.1