Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-01-09 01:00:25 +00:00
committed by GitHub
34 changed files with 2325 additions and 828 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.9.16";
version = "5.10.5";
in
buildLinux (args // {
@@ -13,11 +13,11 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-lqx1";
sha256 = "0ljvqf91nxpql98z75bicg5y3nzkm41rq5b0rm1kcnsk0ji829ps";
sha256 = "1qnxmxahx1wpwhpjz6gdm5zdy1gd8ic3p7vqbz55vx4ygn865gyv";
};
extraMeta = {
branch = "5.9/master";
branch = "5.10/master";
maintainers = with stdenv.lib.maintainers; [ atemu ];
description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
};