about summary refs log tree commit diff
path: root/modules/hardware
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-09-16 17:27:32 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-09-16 17:30:25 +0200
commit43913c8148157fd1157355a1994b1e39d4b82597 (patch)
tree165de5eba38061448921378f524da936fdacf4ad /modules/hardware
parentd2d2cfaf940a7e34780e714ac95733bc738f56ad (diff)
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 <aszlig@redmoonstudios.org>
Upstream issue: https://bugs.freedesktop.org/show_bug.cgi?id=97529
Diffstat (limited to 'modules/hardware')
-rw-r--r--modules/hardware/t100ha/default.nix22
1 files changed, 1 insertions, 21 deletions
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;