From 4a0070fc9f4f008fed843818dfb3c2db10c54e0c Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 18 Jan 2021 10:45:22 +0100 Subject: [PATCH 1/2] zen-kernels: refactor suffix Changing it required modifications in multiple places which is error-prone --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 5 +++-- pkgs/os-specific/linux/kernel/linux-zen.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index c8f5df788b77..057a957e6209 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -2,17 +2,18 @@ let version = "5.10.6"; + suffix = "lqx1"; in buildLinux (args // { - modDirVersion = "${version}-lqx1"; + modDirVersion = "${version}-${suffix}"; inherit version; isZen = true; src = fetchFromGitHub { owner = "zen-kernel"; repo = "zen-kernel"; - rev = "v${version}-lqx1"; + rev = "v${version}-${suffix}"; sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 118272d28762..6409e90ea32f 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,17 +2,18 @@ let version = "5.10.6"; + suffix = "zen1"; in buildLinux (args // { - modDirVersion = "${version}-zen1"; + modDirVersion = "${version}-${suffix}"; inherit version; isZen = true; src = fetchFromGitHub { owner = "zen-kernel"; repo = "zen-kernel"; - rev = "v${version}-zen1"; + rev = "v${version}-${suffix}"; sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw"; }; From ea051b0417d2257c3b67450e8b85f936cfe753b1 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 18 Jan 2021 10:50:35 +0100 Subject: [PATCH 2/2] zen-kernels: 5.10.6 -> 5.10.9 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 057a957e6209..9666300d142f 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.10.6"; + version = "5.10.9"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0vvb00311yhf08ib3yvkjwk2j45f8r268ywg5299yjgbyl6g95kg"; + sha256 = "1j0rz4j1br7kzg9zb5l2xz60ccr4iwjndxq3f4gml8s3fb4cpp6f"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 6409e90ea32f..0567a127daee 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.6"; + version = "5.10.9"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0asn4ysnzv845g35ca9sdi89sc7clcc88xmx64pcxmh033civ5fw"; + sha256 = "0p7w2ib8aac0cx16fksr8870kmijw86hbzdkjsq1ww07ifnb4qir"; }; extraMeta = {