From 7fbb42eabb540bd15378e87156cca262f8c4065d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Jan 2018 17:17:45 -0600
Subject: [PATCH] Similarly, use 4.15 kernel headers instead of patching 4.14
 w/uapi fixes

---
 .../linux/kernel-headers/default.nix          | 19 +++----------------
 pkgs/top-level/all-packages.nix               |  4 ++--
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index a2b37111dc7f..36aeb71264fb 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -69,21 +69,8 @@ in {
     sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
   };
 
-  linuxHeaders_4_14 = common {
-    version = "4.14.13";
-    sha256 = "0wjpwhrnnvf6l3zpkkxk34dl722w9yp8j3vnh0xzi3hgb8dnvd2a";
-
-    patches = [
-      (fetchurl {
-        name = "uapi_libc_compat.patch";
-        url = "https://patchwork.ozlabs.org/patch/854342/raw/";
-        sha256 = "0qczlgqfbw0czx63wg2zgla15zpmcc76d00cb7qwl514ysm4ihmj";
-      })
-      (fetchurl {
-        name = "struct_ethhdr.patch";
-        url = "https://patchwork.ozlabs.org/patch/855293/raw/";
-        sha256 = "0019nxilbgv986sswxyvii50l5l3n9yp4ysgnjdp9104plcq9956";
-      })
-    ];
+  linuxHeaders_4_15 = common {
+    version = "4.15";
+    sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8c143abddb7..945c3a580369 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12928,8 +12928,8 @@ with pkgs;
   lkl = callPackage ../applications/virtualization/lkl { };
 
   inherit (callPackages ../os-specific/linux/kernel-headers { })
-    linuxHeaders_4_4 linuxHeaders_4_14;
-  linuxHeaders = if hostPlatform.isMusl then linuxHeaders_4_14 else linuxHeaders_4_4;
+    linuxHeaders_4_4 linuxHeaders_4_15;
+  linuxHeaders = if hostPlatform.isMusl then linuxHeaders_4_15 else linuxHeaders_4_4;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };