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

Merge branch 'staging' into gcc-7

Browse Source
This commit is contained in:
Vladimír Čunát 2018-02-19 16:21:55 +01:00
commit be8062d34b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
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 {
linuxHeaders_4_4 = common {
version = "4.4.10";
sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
};
linuxHeaders_4_15 = common {
linuxHeaders = common {
version = "4.15";
sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
};

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

@ -12957,8 +12957,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 { };