diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:24:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:24:16 +0000 |
commit | 83b8726e5f6f85a28405c7772f75093fd9a399a3 (patch) | |
tree | 5864b8d15f92f596e4750302c13c3b50f0d6aaf4 /pkgs/os-specific | |
parent | 538bce249c736adf495d4b9ed87883a570c7962b (diff) | |
parent | 95e6dfd5d9065feaa527eecb04f2fd49048bbca0 (diff) | |
download | nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.gz nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.bz2 nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.lz nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.xz nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.zst nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/velbus-aio/default.nix
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/zen-kernels.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 716a45820ca5..f978cb429df5 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.5.7"; #zen - suffix = "zen2"; #zen - sha256 = "0qy3xn7kr16crm7iw1zhm3kpgxpmn66xc4g1yalvghwn6si0n81l"; #zen + version = "6.5.8"; #zen + suffix = "zen1"; #zen + sha256 = "0pg5q5alsxrbbf8hzbcgmwsyirs86715qijdzaldyw9sf74h4z1l"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.7"; #lqx + version = "6.5.8"; #lqx suffix = "lqx1"; #lqx - sha256 = "1c4093xhfnzx6h8frqcigdlikgy1n0vv34ajs0237v3w7psw99d7"; #lqx + sha256 = "1f10p7mriwjrgmdfz10vs48xiipdk9ljj884fsj63r5n1g7pz4bf"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { |