summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-01-09 01:00:25 +0000
committerGitHub <noreply@github.com>2021-01-09 01:00:25 +0000
commite251591528ebecb21626f098e6ce62562568489d (patch)
treeb10d92cc925da3fc1eec8b04ba8352e09c31e4db /pkgs/os-specific/linux
parentf89e74dbcc1398d1747039313b1f5f89110d9db8 (diff)
parent9ff1aa8d2ce70fa2c4417eab055d182623f98429 (diff)
downloadnixpkgs-e251591528ebecb21626f098e6ce62562568489d.tar
nixpkgs-e251591528ebecb21626f098e6ce62562568489d.tar.gz
nixpkgs-e251591528ebecb21626f098e6ce62562568489d.tar.bz2
nixpkgs-e251591528ebecb21626f098e6ce62562568489d.tar.lz
nixpkgs-e251591528ebecb21626f098e6ce62562568489d.tar.xz
nixpkgs-e251591528ebecb21626f098e6ce62562568489d.tar.zst
nixpkgs-e251591528ebecb21626f098e6ce62562568489d.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-lqx.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index f2704378979..7c10ef55bb6 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -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)";
   };