diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-10-08 10:57:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-08 10:57:31 +0100 |
| commit | 65f57275fe5df2dc061c0e9014541816bc1bb77c (patch) | |
| tree | 5948aef15ee03d3fe1fb40c867aa56410ef121f9 | |
| parent | 50a077328a2ca41210154785394d95c396d24e6e (diff) | |
| parent | f8624693891f58f304724f7a413371057cbfdc0f (diff) | |
| download | nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.tar nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.tar.gz nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.tar.bz2 nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.tar.lz nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.tar.xz nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.tar.zst nixpkgs-65f57275fe5df2dc061c0e9014541816bc1bb77c.zip | |
Merge pull request #259650 from JerrySM64/update-linux-zen
linuxKernel.kernels.linux_zen: 6.5.5-zen1 -> 6.5.6-zen2; linuxKernel.kernels.linux_lqx: 6.5.5-lqx2 -> 6.5.6-lqx1
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/zen-kernels.nix | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 85a2fd9d68c..ce498371a21 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8039,6 +8039,12 @@ githubId = 854319; name = "Matt McHenry"; }; + jerrysm64 = { + email = "jerry.starke@icloud.com"; + github = "jerrysm64"; + githubId = 42114389; + name = "Jerry Starke"; + }; jeschli = { email = "jeschli@gmail.com"; github = "0mbi"; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 2006b8f1e6d..fc97aee3f1c 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.5"; #zen - suffix = "zen1"; #zen - sha256 = "069hxkww14dpz7k5hd93qnv6clc0dkpd3ncf1wzr5k84a0i9syj8"; #zen + version = "6.5.6"; #zen + suffix = "zen2"; #zen + sha256 = "0q7zk9r8qp88sg6h9kig1f55h5xl0wyp13d57cpi5s5xa8w3l8wa"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.5"; #lqx - suffix = "lqx2"; #lqx - sha256 = "18gji7l3mgm8z0vi99q5xzrmpmw7jm1sqm2mc6abs51bi5vwir09"; #lqx + version = "6.5.6"; #lqx + suffix = "lqx1"; #lqx + sha256 = "0c409zh6rlrf8c3lr1ci55h0k6lh6ncc4hfv6p50q321czpgfnc6"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { @@ -102,7 +102,7 @@ let extraMeta = { branch = lib.versions.majorMinor version + "/master"; - maintainers = with lib.maintainers; [ thiagokokada ]; + maintainers = with lib.maintainers; [ thiagokokada jerrysm64 ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen, but less aggressive release schedule and additional extra config)"; broken = stdenv.isAarch64; |