From 75c3a736c0c0398985106750d1a3f002d3e4074f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 14 Jul 2020 00:21:17 -0400
Subject: [PATCH] linux_pinebookpro_latest: 5.6 -> 5.7

---
 kernel/latest/default.nix | 14 +++++++++-----
 overlay.nix               |  7 +------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/kernel/latest/default.nix b/kernel/latest/default.nix
index 8ea533b..b53ecae 100644
--- a/kernel/latest/default.nix
+++ b/kernel/latest/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, pkgs
 , lib
 , kernelPatches
 , buildPackages
@@ -16,7 +17,7 @@ let
     splitString
     optionalString
   ;
-  version = "5.6";
+  version = "5.7";
   additionalConfig = {
     name = "pinebookpro-config-fixes";
     patch = null;
@@ -42,9 +43,12 @@ in
 buildLinux (args // {
   inherit version;
 
-  kernelPatches = kernelPatches ++ [
+  kernelPatches = lib.lists.unique (kernelPatches ++ [
+    pkgs.kernelPatches.bridge_stp_helper
+    pkgs.kernelPatches.request_key_helper
+    pkgs.kernelPatches.export_kernel_fpu_functions."5.3"
     additionalConfig
-  ];
+  ]);
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -56,8 +60,8 @@ buildLinux (args // {
     domain = "gitlab.manjaro.org";
     owner = "tsys";
     repo = "linux-pinebook-pro";
-    rev = "93293259039d6fc3a725961d42b4f11bfc3f5127";
-    sha256 = "0yrn22j10f3f6hxmbd23ccis35f9s8cbjvzxiyxnsch2zab9349s";
+    rev = "a8f4db8a726e5e4552e61333dcd9ea1ff35f39f9";
+    sha256 = "1vbach0y28c29hjjx4sc9hda4jxyqfhv4wlip3ky93vf4gxm2fij";
   };
 
   postInstall = (optionalString (args ? postInstall) args.postInstall) + ''
diff --git a/overlay.nix b/overlay.nix
index e0c2b86..2c1a6ee 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -15,12 +15,7 @@ in
   linux_pinebookpro = throw "The linux_pinebookpro attribute has been replaced by linux_pinebookpro_latest.";
   linuxPackages_pinebookpro = throw "The linuxPackages_pinebookpro attribute has been replaced by linuxPackages_pinebookpro_latest.";
 
-  linux_pinebookpro_latest = callPackage ./kernel/latest {
-    kernelPatches = [
-      kernelPatches.bridge_stp_helper
-      kernelPatches.export_kernel_fpu_functions."5.3"
-    ];
-  };
+  linux_pinebookpro_latest = callPackage ./kernel/latest { kernelPatches = []; };
   linuxPackages_pinebookpro_latest = linuxPackagesFor final.linux_pinebookpro_latest;
 
   pinebookpro-firmware = callPackage ./firmware {};