From aeee4fc133c2e2f4d0d88bb3c6ff9f1947f4d697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:03:01 -0400 Subject: [PATCH] treewide: replace mkPackageOptionMD with mkPackageOption --- nixos/modules/programs/screen.nix | 2 +- nixos/modules/services/admin/pgadmin.nix | 2 +- nixos/modules/services/desktop-managers/plasma6.nix | 4 ++-- nixos/modules/services/games/armagetronad.nix | 2 +- nixos/modules/services/games/teeworlds.nix | 2 +- nixos/modules/services/hardware/auto-epp.nix | 2 +- nixos/modules/services/home-automation/ebusd.nix | 2 +- nixos/modules/services/home-automation/matter-server.nix | 2 +- nixos/modules/services/networking/gns3-server.nix | 8 ++++---- nixos/modules/services/networking/xrdp.nix | 4 ++-- nixos/modules/services/search/hound.nix | 2 +- nixos/modules/services/web-apps/code-server.nix | 2 +- nixos/modules/services/web-apps/invidious.nix | 2 +- nixos/modules/services/web-apps/pretalx.nix | 2 +- nixos/modules/services/web-apps/silverbullet.nix | 2 +- nixos/modules/services/web-apps/slskd.nix | 2 +- nixos/modules/services/web-apps/suwayomi-server.nix | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix index 4f3cd9fcf9a5..63bfe6576cc0 100644 --- a/nixos/modules/programs/screen.nix +++ b/nixos/modules/programs/screen.nix @@ -9,7 +9,7 @@ in programs.screen = { enable = lib.mkEnableOption "screen, a basic terminal multiplexer"; - package = lib.mkPackageOptionMD pkgs "screen" { }; + package = lib.mkPackageOption pkgs "screen" { }; screenrc = lib.mkOption { type = lib.types.lines; diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix index b3dd3c78874c..9c430bd05e71 100644 --- a/nixos/modules/services/admin/pgadmin.nix +++ b/nixos/modules/services/admin/pgadmin.nix @@ -35,7 +35,7 @@ in default = 5050; }; - package = mkPackageOptionMD pkgs "pgadmin4" { }; + package = mkPackageOption pkgs "pgadmin4" { }; initialEmail = mkOption { description = "Initial email for the pgAdmin account"; diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 796e24286f9e..01a5bfa1dee2 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -8,7 +8,7 @@ cfg = config.services.desktopManager.plasma6; inherit (pkgs) kdePackages; - inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types; + inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOption types; activationScript = '' # will be rebuilt automatically @@ -29,7 +29,7 @@ in { description = "Enable Qt 5 integration (theming, etc). Disable for a pure Qt 6 system."; }; - notoPackage = mkPackageOptionMD pkgs "Noto fonts - used for UI by default" { + notoPackage = mkPackageOption pkgs "Noto fonts - used for UI by default" { default = ["noto-fonts"]; example = "noto-fonts-lgc-plus"; }; diff --git a/nixos/modules/services/games/armagetronad.nix b/nixos/modules/services/games/armagetronad.nix index 71c8528a9f6e..dfeadb19026f 100644 --- a/nixos/modules/services/games/armagetronad.nix +++ b/nixos/modules/services/games/armagetronad.nix @@ -36,7 +36,7 @@ in options = { enable = mkEnableOption "armagetronad"; - package = lib.mkPackageOptionMD pkgs "armagetronad-dedicated" { + package = lib.mkPackageOption pkgs "armagetronad-dedicated" { example = '' pkgs.armagetronad."0.2.9-sty+ct+ap".dedicated ''; diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix index 1958fd414178..b9ed49937a7f 100644 --- a/nixos/modules/services/games/teeworlds.nix +++ b/nixos/modules/services/games/teeworlds.nix @@ -95,7 +95,7 @@ in services.teeworlds = { enable = mkEnableOption "Teeworlds Server"; - package = mkPackageOptionMD pkgs "teeworlds-server" { }; + package = mkPackageOption pkgs "teeworlds-server" { }; openPorts = mkOption { type = types.bool; diff --git a/nixos/modules/services/hardware/auto-epp.nix b/nixos/modules/services/hardware/auto-epp.nix index b568dec26f4c..1d939a98142e 100644 --- a/nixos/modules/services/hardware/auto-epp.nix +++ b/nixos/modules/services/hardware/auto-epp.nix @@ -10,7 +10,7 @@ in { services.auto-epp = { enable = lib.mkEnableOption "auto-epp for amd active pstate"; - package = lib.mkPackageOptionMD pkgs "auto-epp" {}; + package = lib.mkPackageOption pkgs "auto-epp" {}; settings = mkOption { type = types.submodule { diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix index f5c5479e8eaf..97d1e2796ada 100644 --- a/nixos/modules/services/home-automation/ebusd.nix +++ b/nixos/modules/services/home-automation/ebusd.nix @@ -11,7 +11,7 @@ in options.services.ebusd = { enable = mkEnableOption "ebusd, a daemon for communication with eBUS heating systems"; - package = mkPackageOptionMD pkgs "ebusd" { }; + package = mkPackageOption pkgs "ebusd" { }; device = mkOption { type = types.str; diff --git a/nixos/modules/services/home-automation/matter-server.nix b/nixos/modules/services/home-automation/matter-server.nix index 7bf1cfe54d17..08a68db71386 100644 --- a/nixos/modules/services/home-automation/matter-server.nix +++ b/nixos/modules/services/home-automation/matter-server.nix @@ -19,7 +19,7 @@ in options.services.matter-server = with types; { enable = mkEnableOption "Matter-server"; - package = mkPackageOptionMD pkgs "python-matter-server" { }; + package = mkPackageOption pkgs "python-matter-server" { }; port = mkOption { type = types.port; diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix index b2f25b158bbb..ec6a53dddc70 100644 --- a/nixos/modules/services/networking/gns3-server.nix +++ b/nixos/modules/services/networking/gns3-server.nix @@ -16,7 +16,7 @@ in { services.gns3-server = { enable = lib.mkEnableOption "GNS3 Server daemon"; - package = lib.mkPackageOptionMD pkgs "gns3-server" { }; + package = lib.mkPackageOption pkgs "gns3-server" { }; auth = { enable = lib.mkEnableOption "password based HTTP authentication to access the GNS3 Server"; @@ -88,17 +88,17 @@ in { dynamips = { enable = lib.mkEnableOption ''Dynamips support''; - package = lib.mkPackageOptionMD pkgs "dynamips" { }; + package = lib.mkPackageOption pkgs "dynamips" { }; }; ubridge = { enable = lib.mkEnableOption ''uBridge support''; - package = lib.mkPackageOptionMD pkgs "ubridge" { }; + package = lib.mkPackageOption pkgs "ubridge" { }; }; vpcs = { enable = lib.mkEnableOption ''VPCS support''; - package = lib.mkPackageOptionMD pkgs "vpcs" { }; + package = lib.mkPackageOption pkgs "vpcs" { }; }; }; }; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 884325d13159..d571c6e4d88d 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -51,11 +51,11 @@ in enable = mkEnableOption "xrdp, the Remote Desktop Protocol server"; - package = mkPackageOptionMD pkgs "xrdp" { }; + package = mkPackageOption pkgs "xrdp" { }; audio = { enable = mkEnableOption "audio support for xrdp sessions. So far it only works with PulseAudio sessions on the server side. No PipeWire support yet"; - package = mkPackageOptionMD pkgs "pulseaudio-module-xrdp" {}; + package = mkPackageOption pkgs "pulseaudio-module-xrdp" {}; }; port = mkOption { diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index e3f9c8da3752..059f514234eb 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -19,7 +19,7 @@ in { ''; }; - package = mkPackageOptionMD pkgs "hound" { }; + package = mkPackageOption pkgs "hound" { }; user = mkOption { default = "hound"; diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix index abb5be50d353..f94a1a8b53fa 100644 --- a/nixos/modules/services/web-apps/code-server.nix +++ b/nixos/modules/services/web-apps/code-server.nix @@ -9,7 +9,7 @@ in { services.code-server = { enable = lib.mkEnableOption "code-server"; - package = lib.mkPackageOptionMD pkgs "code-server" { + package = lib.mkPackageOption pkgs "code-server" { example = '' pkgs.vscode-with-extensions.override { vscode = pkgs.code-server; diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index f0e860383a62..7997ea1f3630 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -390,7 +390,7 @@ in ''; }; - package = lib.mkPackageOptionMD pkgs "http3-ytproxy" { }; + package = lib.mkPackageOption pkgs "http3-ytproxy" { }; }; }; diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 1411d11982c8..2280d9165b40 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -35,7 +35,7 @@ in options.services.pretalx = { enable = lib.mkEnableOption "pretalx"; - package = lib.mkPackageOptionMD pkgs "pretalx" {}; + package = lib.mkPackageOption pkgs "pretalx" {}; group = lib.mkOption { type = lib.types.str; diff --git a/nixos/modules/services/web-apps/silverbullet.nix b/nixos/modules/services/web-apps/silverbullet.nix index 5d5f950a9a66..a6a830e674b4 100644 --- a/nixos/modules/services/web-apps/silverbullet.nix +++ b/nixos/modules/services/web-apps/silverbullet.nix @@ -14,7 +14,7 @@ in services.silverbullet = { enable = lib.mkEnableOption "Silverbullet, an open-source, self-hosted, offline-capable Personal Knowledge Management (PKM) web application"; - package = lib.mkPackageOptionMD pkgs "silverbullet" { }; + package = lib.mkPackageOption pkgs "silverbullet" { }; openFirewall = lib.mkOption { type = lib.types.bool; diff --git a/nixos/modules/services/web-apps/slskd.nix b/nixos/modules/services/web-apps/slskd.nix index 6254fe294eee..7d4bc66c7399 100644 --- a/nixos/modules/services/web-apps/slskd.nix +++ b/nixos/modules/services/web-apps/slskd.nix @@ -7,7 +7,7 @@ in { options.services.slskd = with lib; with types; { enable = mkEnableOption "slskd"; - package = mkPackageOptionMD pkgs "slskd" { }; + package = mkPackageOption pkgs "slskd" { }; user = mkOption { type = types.str; diff --git a/nixos/modules/services/web-apps/suwayomi-server.nix b/nixos/modules/services/web-apps/suwayomi-server.nix index ba2352d0e693..caa091685d2f 100644 --- a/nixos/modules/services/web-apps/suwayomi-server.nix +++ b/nixos/modules/services/web-apps/suwayomi-server.nix @@ -11,7 +11,7 @@ in services.suwayomi-server = { enable = mkEnableOption "Suwayomi, a free and open source manga reader server that runs extensions built for Tachiyomi"; - package = lib.mkPackageOptionMD pkgs "suwayomi-server" { }; + package = lib.mkPackageOption pkgs "suwayomi-server" { }; dataDir = mkOption { type = types.path;