From 85a2b5542eed00c5d3362394cc1aca575b963e3a Mon Sep 17 00:00:00 2001 From: mexisme Date: Wed, 31 Jan 2024 21:32:59 +1300 Subject: [PATCH] Restore the "majorVersion" functionality --- microsoft/surface/common/kernel/linux-6.6.x/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/microsoft/surface/common/kernel/linux-6.6.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix index 6663138..c06ac8c 100644 --- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix +++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkIf mkOption types; + inherit (lib) mkIf mkOption; - inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches; + inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches isVersionOf versionsOfOption; cfg = config.microsoft-surface; @@ -20,10 +20,10 @@ let in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ version ]; + type = versionsOfOption version; }; - config = mkIf (cfg.kernelVersion == version) { + config = mkIf (isVersionOf cfg.kernelVersion version) { boot = { inherit kernelPackages; };