about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-18 16:59:29 -0500
committerShea Levy <shea@shealevy.com>2018-02-18 16:59:29 -0500
commitfd0f15f11c0d2bc84d1c364f438f6301b452551c (patch)
tree4cf7431475d62258d877e1814992e2b2687f54e0
parentbbfc9ce376d425db075a3a97c5b1363e2826acbe (diff)
downloadnixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.tar
nixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.tar.gz
nixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.tar.bz2
nixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.tar.lz
nixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.tar.xz
nixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.tar.zst
nixlib-fd0f15f11c0d2bc84d1c364f438f6301b452551c.zip
linuxHeaders: Bump default to 4.15.
-rw-r--r--pkgs/os-specific/linux/kernel-headers/default.nix7
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index b95013ab26dc..8107f7d96575 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -55,12 +55,7 @@ let
   };
 in {
 
-  linuxHeaders_4_4 = common {
-    version = "4.4.10";
-    sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
-  };
-
-  linuxHeaders_4_15 = common {
+  linuxHeaders = common {
     version = "4.15";
     sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1fa50cffa94..b88e3fa6f431 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12951,8 +12951,7 @@ with pkgs;
   lkl = callPackage ../applications/virtualization/lkl { };
 
   inherit (callPackages ../os-specific/linux/kernel-headers { })
-    linuxHeaders_4_4 linuxHeaders_4_15;
-  linuxHeaders = if hostPlatform.isMusl || hostPlatform.isRiscV then linuxHeaders_4_15 else linuxHeaders_4_4;
+    linuxHeaders;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };