From 9d66a1bc398d7ea89135aeb49615e8ee1086e4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 16 Apr 2026 10:02:46 -0700 Subject: [PATCH] zfs: simplify kernelIsCompatible function --- pkgs/os-specific/linux/zfs/generic.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index ac55f618dccc..ea017985f78e 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -76,20 +76,8 @@ let ]; kernelIsCompatible = kernel: - let - nextMajorMinor = - ver: - "${lib.versions.major ver}.${ - lib.pipe ver [ - lib.versions.minor - lib.toInt - (x: x + 1) - toString - ] - }"; - in (lib.versionAtLeast kernel.version kernelMinSupportedMajorMinor) - && (lib.versionOlder kernel.version (nextMajorMinor kernelMaxSupportedMajorMinor)); + && (lib.versionAtLeast kernelMaxSupportedMajorMinor (lib.versions.majorMinor kernel.version)); # XXX: You always want to build kernel modules with the same stdenv as the # kernel was built with. However, since zfs can also be built for userspace we