From 98f03dfc5ac822cf8648afbe3cadb552bea46835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Wed, 25 May 2022 15:25:09 -0300
Subject: [PATCH 01/10] kernel/update-zen.sh: add support to .0 patch versions

(cherry picked from commit 3c4e372c3f5a7ad8ff1182120a4ee99f9042abc4)
---
 pkgs/os-specific/linux/kernel/update-zen.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/update-zen.sh b/pkgs/os-specific/linux/kernel/update-zen.sh
index 48b29b6dd43d..0984031b2814 100755
--- a/pkgs/os-specific/linux/kernel/update-zen.sh
+++ b/pkgs/os-specific/linux/kernel/update-zen.sh
@@ -7,6 +7,8 @@ old=$(nix-instantiate --eval -A linuxPackages_zen.kernel.modDirVersion "$nixpkgs
 old="${old%\"}"
 old="${old#\"}"
 new=$(curl https://github.com/zen-kernel/zen-kernel/releases.atom | grep -m1 -o -E '[0-9.]+-zen[0-9]+')
+# add ".0" patch to modDirVersion when minor only
+new=$(echo "$new" | sed -E 's/^([0-9]+)\.([0-9]+)-(\w+)$/\1.\2.0-\3/')
 if [[ "$new" == "$old" ]]; then
     echo "already up-to-date"
     exit 0

From bcdb5e70724e4a8a013e62a1abff2cd9167b74f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Wed, 25 May 2022 15:21:11 -0300
Subject: [PATCH 02/10] linuxKernel.kernels.linux_zen: 5.17.7-zen1 ->
 5.18.0-zen1

(cherry picked from commit 208fd4f17325cf506eea151e3614ae2081fa8b6c)
---
 pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 7c46c6131b20..6cd542c10726 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
 
 let
   # having the full version string here makes it easier to update
-  modDirVersion = "5.17.7-zen1";
+  modDirVersion = "5.18.0-zen1";
   parts = lib.splitString "-" modDirVersion;
   version = lib.elemAt parts 0;
   suffix = lib.elemAt parts 1;
@@ -20,7 +20,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     inherit rev;
-    sha256 = "sha256-sjXe+L9ZTtHDPLFY5d7Ui0NU0s7fw0qLfXIDnRxpKvE=";
+    sha256 = "sha256-A0QrY1REbRODnHtmyNqVaiLhDgYCECevfHZCxtoQ9kU=";
   };
 
   structuredExtraConfig = with lib.kernel; {

From dbcb7e4b18a785b52d3476fdedba99721f543c5d Mon Sep 17 00:00:00 2001
From: InternetUnexplorer <internetunexplorer@gmail.com>
Date: Fri, 3 Jun 2022 00:43:08 -0700
Subject: [PATCH 03/10] linux_zen: 5.18.0-zen1 -> 5.18.1-zen1

This also disables WERROR, which is necessary until #175433 reaches
master (which disables it for all kernels).

(cherry picked from commit c240539dbaeb605c089c1d4a599f4e3044f1137e)
---
 pkgs/os-specific/linux/kernel/linux-zen.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 6cd542c10726..0e9a632ddb56 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
 
 let
   # having the full version string here makes it easier to update
-  modDirVersion = "5.18.0-zen1";
+  modDirVersion = "5.18.1-zen1";
   parts = lib.splitString "-" modDirVersion;
   version = lib.elemAt parts 0;
   suffix = lib.elemAt parts 1;
@@ -20,11 +20,14 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     inherit rev;
-    sha256 = "sha256-A0QrY1REbRODnHtmyNqVaiLhDgYCECevfHZCxtoQ9kU=";
+    sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY=";
   };
 
   structuredExtraConfig = with lib.kernel; {
     ZEN_INTERACTIVE = yes;
+    # TODO: Remove once #175433 reaches master
+    # https://nixpk.gs/pr-tracker.html?pr=175433
+    WERROR = no;
   };
 
   extraMeta = {

From 67aa004802a7c64d05a25dc92d60eb95f3b60ca7 Mon Sep 17 00:00:00 2001
From: InternetUnexplorer <internetunexplorer@gmail.com>
Date: Thu, 16 Jun 2022 17:36:57 -0700
Subject: [PATCH 04/10] linux_zen: 5.18.1-zen1 -> 5.18.5-zen1

(cherry picked from commit 089d7e3941cb7baccfb3f1c9cd6ec8fd8f703d14)
---
 pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 0e9a632ddb56..504cb1267429 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
 
 let
   # having the full version string here makes it easier to update
-  modDirVersion = "5.18.1-zen1";
+  modDirVersion = "5.18.5-zen1";
   parts = lib.splitString "-" modDirVersion;
   version = lib.elemAt parts 0;
   suffix = lib.elemAt parts 1;
@@ -20,7 +20,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     inherit rev;
-    sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY=";
+    sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4=";
   };
 
   structuredExtraConfig = with lib.kernel; {

From ede447e282cf5581175b8474741fa5661700fb84 Mon Sep 17 00:00:00 2001
From: Dmitriy <43755002+psydvl@users.noreply.github.com>
Date: Mon, 28 Mar 2022 21:59:12 +0300
Subject: [PATCH 05/10] linux_lqx, linux_zen: refactor to unify Unify linux_zen
 and linux_lqx -> zen-kernels

(cherry picked from commit 40674f0d7f6b06f0b96a6b24cb8d31363a92da86)
---
 pkgs/os-specific/linux/kernel/linux-lqx.nix   | 26 ------------
 pkgs/os-specific/linux/kernel/linux-zen.nix   | 39 ------------------
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 40 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              | 20 ++++++----
 4 files changed, 52 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-lqx.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-zen.nix
 create mode 100644 pkgs/os-specific/linux/kernel/zen-kernels.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
deleted file mode 100644
index 0d56108f2f23..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
-
-let
-  version = "5.15.16";
-  suffix = "lqx2";
-in
-
-buildLinux (args // {
-  modDirVersion = "${version}-${suffix}";
-  inherit version;
-  isZen = true;
-
-  src = fetchFromGitHub {
-    owner = "zen-kernel";
-    repo = "zen-kernel";
-    rev = "v${version}-${suffix}";
-    sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg=";
-  };
-
-  extraMeta = {
-    branch = "5.14/master";
-    maintainers = with lib.maintainers; [ atemu ];
-    description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
-  };
-
-} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
deleted file mode 100644
index 504cb1267429..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, fetchFromGitHub, buildLinux, ... } @ args:
-
-let
-  # having the full version string here makes it easier to update
-  modDirVersion = "5.18.5-zen1";
-  parts = lib.splitString "-" modDirVersion;
-  version = lib.elemAt parts 0;
-  suffix = lib.elemAt parts 1;
-
-  numbers = lib.splitString "." version;
-  branch = "${lib.elemAt numbers 0}.${lib.elemAt numbers 1}";
-  rev = if ((lib.elemAt numbers 2) == "0") then "v${branch}-${suffix}" else "v${modDirVersion}";
-in
-
-buildLinux (args // {
-  inherit version modDirVersion;
-  isZen = true;
-
-  src = fetchFromGitHub {
-    owner = "zen-kernel";
-    repo = "zen-kernel";
-    inherit rev;
-    sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4=";
-  };
-
-  structuredExtraConfig = with lib.kernel; {
-    ZEN_INTERACTIVE = yes;
-    # TODO: Remove once #175433 reaches master
-    # https://nixpk.gs/pr-tracker.html?pr=175433
-    WERROR = no;
-  };
-
-  extraMeta = {
-    inherit branch;
-    maintainers = with lib.maintainers; [ atemu andresilva ];
-    description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
-  };
-
-} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
new file mode 100644
index 000000000000..70c078289f6c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -0,0 +1,40 @@
+{ lib, fetchFromGitHub, buildLinux, ... } @ args:
+
+let
+  zenVariant = {
+    version = "5.18.5";
+    suffix = "zen1";
+    sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4=";
+    isLqx = false;
+  };
+  lqxVariant = {
+    version = "5.15.16";
+    suffix = "lqx2";
+    sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg=";
+    isLqx = true;
+  };
+  zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
+    inherit version;
+    modDirVersion = "${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version ++ [ "0" "0" ]))}-${suffix}";
+    isZen = true;
+
+    src = fetchFromGitHub {
+      owner = "zen-kernel";
+      repo = "zen-kernel";
+      rev = "v${version}-${suffix}";
+      inherit sha256;
+    };
+
+    extraMeta = {
+      branch = lib.versions.majorMinor version + "/master";
+      maintainers = with lib.maintainers; [ atemu andresilva psydvl ];
+      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)";
+    };
+
+  } // (args.argsOverride or { }));
+in
+{
+  zen = zenKernelsFor zenVariant;
+  lqx = zenKernelsFor lqxVariant;
+}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index c5d7f9d422ed..29359fc33b3a 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -196,19 +196,23 @@ in {
       ];
     };
 
-    linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix {
-      kernelPatches = [
-        kernelPatches.bridge_stp_helper
-        kernelPatches.request_key_helper
-      ];
-    };
+    # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
+    # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
+    zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
 
-    linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix {
+    linux_zen = (zenKernels {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
       ];
-    };
+    }).zen;
+
+    linux_lqx = (zenKernels {
+      kernelPatches = [
+        kernelPatches.bridge_stp_helper
+        kernelPatches.request_key_helper
+      ];
+    }).lqx;
 
     # This contains both the STABLE and EDGE variants of the XanMod kernel
     xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix;

From 893e54b008999319ca3ff296894d420e560506f8 Mon Sep 17 00:00:00 2001
From: Dmitriy <43755002+psydvl@users.noreply.github.com>
Date: Wed, 29 Jun 2022 01:22:47 +0300
Subject: [PATCH 06/10] linux_lqx, linux_zen: add update script

(cherry picked from commit 66c8475a8ffc7d1432d27e46f61dcbe8a4423b88)
---
 pkgs/os-specific/linux/kernel/update-zen.py   | 97 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/update-zen.sh   | 23 -----
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 17 ++--
 3 files changed, 108 insertions(+), 29 deletions(-)
 create mode 100755 pkgs/os-specific/linux/kernel/update-zen.py
 delete mode 100755 pkgs/os-specific/linux/kernel/update-zen.sh

diff --git a/pkgs/os-specific/linux/kernel/update-zen.py b/pkgs/os-specific/linux/kernel/update-zen.py
new file mode 100755
index 000000000000..204a39ad3a9a
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/update-zen.py
@@ -0,0 +1,97 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3 nix nix-prefetch-git
+
+import fileinput
+import json
+import os
+import sys
+import re
+import subprocess
+
+from datetime import datetime
+from urllib.request import urlopen, Request
+
+
+def panic(exc):
+    raise Exception(exc)
+
+
+DIR = os.path.dirname(os.path.abspath(__file__))
+HEADERS = {'Accept': 'application/vnd.github.v3+json'}
+
+
+def github_api_request(endpoint):
+    base_url = 'https://api.github.com/'
+    request = Request(base_url + endpoint, headers=HEADERS)
+    with urlopen(request) as http_response:
+        return json.loads(http_response.read().decode('utf-8'))
+
+
+def get_commit_date(repo, sha):
+    url = f'https://api.github.com/repos/{repo}/commits/{sha}'
+    request = Request(url, headers=HEADERS)
+    with urlopen(request) as http_response:
+        commit = json.loads(http_response.read().decode())
+        date = commit['commit']['committer']['date'].rstrip('Z')
+        date = datetime.fromisoformat(date).date().isoformat()
+        return 'unstable-' + date
+
+
+def nix_prefetch_git(url, rev):
+    """Prefetches the requested Git revision (incl. submodules) of the given repository URL."""
+    print(f'nix-prefetch-git {url} {rev}')
+    out = subprocess.check_output([
+        'nix-prefetch-git', '--quiet',
+        '--url', url,
+        '--rev', rev,
+        '--fetch-submodules'])
+    return json.loads(out)['sha256']
+
+
+def nix_prefetch_url(url, unpack=False):
+    """Prefetches the content of the given URL."""
+    print(f'nix-prefetch-url {url}')
+    options = ['--type', 'sha256']
+    if unpack:
+        options += ['--unpack']
+    out = subprocess.check_output(['nix-prefetch-url'] + options + [url])
+    return out.decode('utf-8').rstrip()
+
+
+def update_file(relpath, variant, version, suffix, sha256):
+    file_path = os.path.join(DIR, relpath)
+    with fileinput.FileInput(file_path, inplace=True) as f:
+        for line in f:
+            result = line
+            result = re.sub(
+                fr'^    version = ".+"; #{variant}',
+                f'    version = "{version}"; #{variant}',
+                result)
+            result = re.sub(
+                fr'^    suffix = ".+"; #{variant}',
+                f'    suffix = "{suffix}"; #{variant}',
+                result)
+            result = re.sub(
+                fr'^    sha256 = ".+"; #{variant}',
+                f'    sha256 = "{sha256}"; #{variant}',
+                result)
+            print(result, end='')
+
+
+if __name__ == "__main__":
+    if len(sys.argv) == 1:
+        panic("Update variant expected")
+    variant = sys.argv[1]
+    if variant not in ("zen", "lqx"):
+        panic(f"Unexepected variant instead of 'zen' or 'lqx': {sys.argv[1]}")
+    pattern = re.compile(fr"v(\d+\.\d+\.?\d*)-({variant}\d+)")
+    zen_tags = github_api_request('repos/zen-kernel/zen-kernel/releases')
+    for tag in zen_tags:
+        zen_match = pattern.match(tag['tag_name'])
+        if zen_match:
+            zen_tag = zen_match.group(0)
+            zen_version = zen_match.group(1)
+            zen_suffix = zen_match.group(2)
+            break
+    zen_hash = nix_prefetch_git('https://github.com/zen-kernel/zen-kernel.git', zen_tag)
+    update_file('zen-kernels.nix', variant, zen_version, zen_suffix, zen_hash)
diff --git a/pkgs/os-specific/linux/kernel/update-zen.sh b/pkgs/os-specific/linux/kernel/update-zen.sh
deleted file mode 100755
index 0984031b2814..000000000000
--- a/pkgs/os-specific/linux/kernel/update-zen.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../../.. -i bash -p nix-prefetch git gnused gnugrep nix curl
-set -euo pipefail -x
-
-nixpkgs="$(git rev-parse --show-toplevel)"
-old=$(nix-instantiate --eval -A linuxPackages_zen.kernel.modDirVersion "$nixpkgs")
-old="${old%\"}"
-old="${old#\"}"
-new=$(curl https://github.com/zen-kernel/zen-kernel/releases.atom | grep -m1 -o -E '[0-9.]+-zen[0-9]+')
-# add ".0" patch to modDirVersion when minor only
-new=$(echo "$new" | sed -E 's/^([0-9]+)\.([0-9]+)-(\w+)$/\1.\2.0-\3/')
-if [[ "$new" == "$old" ]]; then
-    echo "already up-to-date"
-    exit 0
-fi
-
-path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix"
-
-sed -i -e "s!modDirVersion = \".*\"!modDirVersion = \"${new}\"!" "$path"
-checksum=$(nix-prefetch "(import ${nixpkgs} {}).linuxPackages_zen.kernel")
-sed -i -e "s!sha256 = \".*\"!sha256 = \"${checksum}\"!" "$path"
-
-git commit -m "linuxKernel.kernels.linux_zen: ${old} -> ${new}" $path
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 70c078289f6c..9ebab05e4d13 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -1,16 +1,19 @@
 { lib, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
+  # comments with variant added for update script
+  # ./update-zen.py zen
   zenVariant = {
-    version = "5.18.5";
-    suffix = "zen1";
-    sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4=";
+    version = "5.18.5"; #zen
+    suffix = "zen1"; #zen
+    sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4="; #zen
     isLqx = false;
   };
+  # ./update-zen.py lqx
   lqxVariant = {
-    version = "5.15.16";
-    suffix = "lqx2";
-    sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg=";
+    version = "5.15.16"; #lqx
+    suffix = "lqx2"; #lqx
+    sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg="; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
@@ -25,6 +28,8 @@ let
       inherit sha256;
     };
 
+    passthru.updateScript = [ ./update-zen.py (if isLqx then "lqx" else "zen") ];
+
     extraMeta = {
       branch = lib.versions.majorMinor version + "/master";
       maintainers = with lib.maintainers; [ atemu andresilva psydvl ];

From 9eee280e28b6dc50e750c7df03c03121b79f171e Mon Sep 17 00:00:00 2001
From: Dmitriy <43755002+psydvl@users.noreply.github.com>
Date: Mon, 28 Mar 2022 21:05:38 +0300
Subject: [PATCH 07/10] linux_lqx: 5.15.16-lqx2 -> 5.18.7-lqx1

(cherry picked from commit adf52ecefe4ce0ade9a1b26c6ff876b425a56183)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 9ebab05e4d13..d159b1be12fa 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
   };
   # ./update-zen.py lqx
   lqxVariant = {
-    version = "5.15.16"; #lqx
-    suffix = "lqx2"; #lqx
-    sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg="; #lqx
+    version = "5.18.7"; #lqx
+    suffix = "lqx1"; #lqx
+    sha256 = "0gyp4x8rlsg5bjr9c8qq0mk3wckyg0navc1sripkj8hrl51vm28c"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

From bcb69e328ff94ccdc8dc6926d42a3228ce279800 Mon Sep 17 00:00:00 2001
From: Dmitriy <43755002+psydvl@users.noreply.github.com>
Date: Wed, 29 Jun 2022 01:29:47 +0300
Subject: [PATCH 08/10] linux_zen: 5.18.5-zen1 -> 5.18.7-zen1

(cherry picked from commit 9da7308bb7e27c37c544d6faf78720c9e80e85c2)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index d159b1be12fa..8eee9e2ea14c 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,9 +4,9 @@ let
   # comments with variant added for update script
   # ./update-zen.py zen
   zenVariant = {
-    version = "5.18.5"; #zen
+    version = "5.18.7"; #zen
     suffix = "zen1"; #zen
-    sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4="; #zen
+    sha256 = "1dxiwrbf15njqcq2kxbsg22hllpcvdwjhdf0gs3xx0xyjbwjyd26"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx

From 64f74edff093761db5ae5223896ced4d00569ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Tue, 5 Jul 2022 14:39:37 -0300
Subject: [PATCH 09/10] zen-kernels: 5.18.7 -> 5.18.9

(cherry picked from commit cbc4d51711102e80013917eea84705cc471febdb)
---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 8eee9e2ea14c..dbe93b778b89 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 = "5.18.7"; #zen
+    version = "5.18.9"; #zen
     suffix = "zen1"; #zen
-    sha256 = "1dxiwrbf15njqcq2kxbsg22hllpcvdwjhdf0gs3xx0xyjbwjyd26"; #zen
+    sha256 = "0smmy7axz874x22s8yram3k64n3w9npfh4irgan1if8k87pgx474"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx
   lqxVariant = {
-    version = "5.18.7"; #lqx
+    version = "5.18.9"; #lqx
     suffix = "lqx1"; #lqx
-    sha256 = "0gyp4x8rlsg5bjr9c8qq0mk3wckyg0navc1sripkj8hrl51vm28c"; #lqx
+    sha256 = "1dvdav0d3fw9frp1l2k525yai071gvign2z81fna3j63ddy2bxp1"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

From 199369b5b98f79fb0733052c332e1d3919f09fbe Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 30 May 2022 07:15:14 +0100
Subject: [PATCH 10/10] linux: disable WERROR by default

gcc update frequently breaks most recent kernel releases due to blanket -Werror
flag. Let's avoid -Werror in a default build to ease kernel and gcc maintenance.

(cherry picked from commit fea73bfd63669e0a22d240e89bb7b451f1888157)
---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 76f8122e477c..c95ba99ef20f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -917,6 +917,9 @@ let
       TASK_DELAY_ACCT = yes;
       TASK_XACCT = yes;
       TASK_IO_ACCOUNTING = yes;
+
+      # Fresh toolchains frequently break -Werror build for minor issues.
+      WERROR = whenAtLeast "5.15" no;
     } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
       # Enable CPU/memory hotplug support
       # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot