diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-21 12:02:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-21 12:02:00 +0000 |
commit | 3087a2d2e96ab840a907dc62b84366e50a9a5ab6 (patch) | |
tree | 7456adc1bd1d33ae50e644953e5d4297d559d289 /pkgs/os-specific/linux/kernel/linux-4.14.nix | |
parent | 0c7cc39e6cfeb8e3dd12cb6a5abf16a91586634e (diff) | |
parent | de72454d43afd149a93a207b41fe0ae90895b158 (diff) | |
download | nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.gz nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.bz2 nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.lz nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.xz nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.zst nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-4.14.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5b94b7ea9b6..ccecc433a4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.239"; + version = "4.14.240"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0"; + sha256 = "1k65qwzlnqnh9ym0n2fxpa8nk2qwvykwhwgaixk3b7ndzmr8b6c8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; |