From 88712a124b9a15e8b487d9bec9847ba0aa876d2c Mon Sep 17 00:00:00 2001 From: mexisme Date: Wed, 31 Jan 2024 21:36:14 +1300 Subject: [PATCH] Pick a better name than "versionsOfOption" --- microsoft/surface/common/kernel/linux-6.6.x/default.nix | 4 ++-- microsoft/surface/common/kernel/linux-package.nix | 4 ++-- 2 files 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 c06ac8c..82b0f0c 100644 --- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix +++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkOption; - inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches isVersionOf versionsOfOption; + inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches isVersionOf versionsOfEnum; cfg = config.microsoft-surface; @@ -20,7 +20,7 @@ let in { options.microsoft-surface.kernelVersion = mkOption { - type = versionsOfOption version; + type = versionsOfEnum version; }; config = mkIf (isVersionOf cfg.kernelVersion version) { diff --git a/microsoft/surface/common/kernel/linux-package.nix b/microsoft/surface/common/kernel/linux-package.nix index 5cb64b1..45b4734 100644 --- a/microsoft/surface/common/kernel/linux-package.nix +++ b/microsoft/surface/common/kernel/linux-package.nix @@ -42,7 +42,7 @@ let # Provides a list of versions that can be used as an enum option for this full version: [ version (versions.majorMinor version) ]; - versionsOfOption = version: + versionsOfEnum = version: # Provide an enum option for versions of this kernel: types.enum (versionsOf version); @@ -51,5 +51,5 @@ let elem version (versionsOf version); in { - inherit linuxPackage repos surfacePatches versionsOf isVersionOf versionsOfOption; + inherit linuxPackage repos surfacePatches versionsOf isVersionOf versionsOfEnum; }