Similarly, use 4.15 kernel headers instead of patching 4.14 w/uapi fixes

+5 -18
+3 -16
pkgs/os-specific/linux/kernel-headers/default.nix
··· 69 69 sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja"; 70 70 }; 71 71 72 - linuxHeaders_4_14 = common { 73 - version = "4.14.13"; 74 - sha256 = "0wjpwhrnnvf6l3zpkkxk34dl722w9yp8j3vnh0xzi3hgb8dnvd2a"; 75 - 76 - patches = [ 77 - (fetchurl { 78 - name = "uapi_libc_compat.patch"; 79 - url = "https://patchwork.ozlabs.org/patch/854342/raw/"; 80 - sha256 = "0qczlgqfbw0czx63wg2zgla15zpmcc76d00cb7qwl514ysm4ihmj"; 81 - }) 82 - (fetchurl { 83 - name = "struct_ethhdr.patch"; 84 - url = "https://patchwork.ozlabs.org/patch/855293/raw/"; 85 - sha256 = "0019nxilbgv986sswxyvii50l5l3n9yp4ysgnjdp9104plcq9956"; 86 - }) 87 - ]; 72 + linuxHeaders_4_15 = common { 73 + version = "4.15"; 74 + sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; 88 75 }; 89 76 }
+2 -2
pkgs/top-level/all-packages.nix
··· 12928 12928 lkl = callPackage ../applications/virtualization/lkl { }; 12929 12929 12930 12930 inherit (callPackages ../os-specific/linux/kernel-headers { }) 12931 - linuxHeaders_4_4 linuxHeaders_4_14; 12932 - linuxHeaders = if hostPlatform.isMusl then linuxHeaders_4_14 else linuxHeaders_4_4; 12931 + linuxHeaders_4_4 linuxHeaders_4_15; 12932 + linuxHeaders = if hostPlatform.isMusl then linuxHeaders_4_15 else linuxHeaders_4_4; 12933 12933 12934 12934 kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; 12935 12935