hardware/t100ha: Switch to latest linux_testing

Currently, linux-next-20160408 introduces a few unrelated bugs to the
hardware, so instead of updating to the latest -next version, we're
going for the latest -rc instead.

This should also help a lot in development to focus on the important
parts instead of dealing with completely unrelated bugs/issues.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 4 insertions, 28 deletions

diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix
index 5c893b7d..c08c20da 100644
--- a/modules/hardware/t100ha/default.nix
+++ b/modules/hardware/t100ha/default.nix
@@ -11,21 +11,7 @@ in {
     # 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;
-      linuxNextVersion = "20160226";
-      mkKernel = import "${nixpkgs}/pkgs/os-specific/linux/kernel/generic.nix";
-      t100haKernel = mkKernel rec {
-        version = "4.5-rc5";
-        modDirVersion = "4.5.0-rc5-next-${linuxNextVersion}";
-        extraMeta.branch = "4.5";
-
-        src = pkgs.fetchgit {
-          url = "git://git.kernel.org/pub/scm/linux/kernel/git/next/"
-              + "linux-next.git";
-          rev = "refs/tags/next-${linuxNextVersion}";
-          sha256 = "0q39mnjyi8jany03b4ral34hicdrgjpab53hg712jzhbcngj5kh3";
-        };
-
+      argsOverride = {
         kernelPatches = [
           { name = "backlight";
             patch = ./backlight.patch;
@@ -46,21 +32,11 @@ in {
           AGP n
           DRM y
           DRM_I915 y
-
-          # These do not compile as of 4.5.0-rc5-next-20160226:
-          VIDEO_EM28XX n
-          RAPIDIO n
         '';
-
-        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;
+
+      patched = pkgs.linux_testing.override { inherit argsOverride; };
+      self = pkgs.linuxPackagesFor patched self;
     in self;
 
     # By default the console is rotated by 90 degrees to the right.