From 3c4e372c3f5a7ad8ff1182120a4ee99f9042abc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 25 May 2022 15:25:09 -0300 Subject: [PATCH 1/2] kernel/update-zen.sh: add support to .0 patch versions --- 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 208fd4f17325cf506eea151e3614ae2081fa8b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Wed, 25 May 2022 15:21:11 -0300 Subject: [PATCH 2/2] linuxKernel.kernels.linux_zen: 5.17.7-zen1 -> 5.18.0-zen1 --- 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; {