From 6416e75475d26cf550f71a3370c22b0f0d53ddd3 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 25 Mar 2026 13:57:18 +0100 Subject: [PATCH] linuxKernel.kernels.linux_zen: fix update script Also remove leftover '# zen' comment from #499218 --- pkgs/os-specific/linux/kernel/update-zen.py | 16 ++++++++-------- pkgs/os-specific/linux/kernel/zen-kernels.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/update-zen.py b/pkgs/os-specific/linux/kernel/update-zen.py index 9b852b164b99..cf33df902057 100755 --- a/pkgs/os-specific/linux/kernel/update-zen.py +++ b/pkgs/os-specific/linux/kernel/update-zen.py @@ -64,24 +64,24 @@ def update_file(relpath, version, suffix, sha256): for line in f: result = line result = re.sub( - fr'^ version = ".+";', - f' version = "{version}";', + r'^(\s*)version = ".+";', + fr'\1version = "{version}";', result) result = re.sub( - fr'^ suffix = ".+";', - f' suffix = "{suffix}";', + r'^(\s*)suffix = ".+";', + fr'\1suffix = "{suffix}";', result) result = re.sub( - fr'^ sha256 = ".+";', - f' sha256 = "{sha256}";', + r'^(\s*)sha256 = ".+";', + fr'\1sha256 = "{sha256}";', result) print(result, end='') def read_file(relpath): file_path = os.path.join(DIR, relpath) - re_version = re.compile(fr'^\s*version = "(.+)";') - re_suffix = re.compile(fr'^\s*suffix = "(.+)";') + re_version = re.compile(r'^\s*version = "(.+)";') + re_suffix = re.compile(r'^\s*suffix = "(.+)";') version = None suffix = None with fileinput.FileInput(file_path, mode='r') as f: diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index a403b0be58b0..54cef6142e23 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,7 +12,7 @@ let # override options if they need using lib.mkForce (that has 50 priority) mkKernelOverride = lib.mkOverride 90; - suffix = "zen1"; # zen + suffix = "zen1"; in buildLinux (