JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linux-headers-4.15' into staging

Browse Source
This commit is contained in:
Shea Levy 2018-02-19 10:10:04 -05:00
commit a34b0274ef
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -55,12 +55,7 @@ let
}; };
in { in {
linuxHeaders_4_4 = common { linuxHeaders = common {
version = "4.4.10";
sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
};
linuxHeaders_4_15 = common {
version = "4.15"; version = "4.15";
sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
}; };

3
pkgs/top-level/all-packages.nix
View File

@ -12951,8 +12951,7 @@ with pkgs;
lkl = callPackage ../applications/virtualization/lkl { }; lkl = callPackage ../applications/virtualization/lkl { };
inherit (callPackages ../os-specific/linux/kernel-headers { }) inherit (callPackages ../os-specific/linux/kernel-headers { })
linuxHeaders_4_4 linuxHeaders_4_15; linuxHeaders;
linuxHeaders = if hostPlatform.isMusl || hostPlatform.isRiscV then linuxHeaders_4_15 else linuxHeaders_4_4;
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };