various: use mkPackageOption

nixos/modules/programs/kubeswitch.nix

@@ -18,12 +18,7 @@ in
         description = "The name of the command to use";
       };
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "kubeswitch" { };
-        type = lib.types.package;
-        default = pkgs.kubeswitch;
-        defaultText = lib.literalExpression "pkgs.kubeswitch";
-        description = "The package to install for kubeswitch";
-      };
     };
   };
 

nixos/modules/security/tpm2.nix

@@ -58,12 +58,7 @@ in
         Trusted Platform 2 userspace resource manager daemon
       '';
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "tpm2-abrmd" { };
-        description = "tpm2-abrmd package to use";
-        type = lib.types.package;
-        default = pkgs.tpm2-abrmd;
-        defaultText = lib.literalExpression "pkgs.tpm2-abrmd";
-      };
     };
 
     pkcs11 = {

nixos/modules/services/continuous-integration/buildkite-agents.nix

@@ -38,12 +38,7 @@ let
           description = "Whether to enable this buildkite agent";
         };
 
-        package = lib.mkOption {
+        package = lib.mkPackageOption pkgs "buildkite-agent" { };
-          default = pkgs.buildkite-agent;
-          defaultText = lib.literalExpression "pkgs.buildkite-agent";
-          description = "Which buildkite-agent derivation to use";
-          type = lib.types.package;
-        };
 
         dataDir = lib.mkOption {
           default = "/var/lib/buildkite-agent-${name}";

nixos/modules/services/databases/chromadb.nix

@@ -9,10 +9,10 @@ let
   cfg = config.services.chromadb;
   inherit (lib)
     mkEnableOption
+    mkPackageOption
     mkOption
     mkIf
     types
-    literalExpression
     ;
 in
 {
@@ -29,13 +29,7 @@ in
     services.chromadb = {
       enable = mkEnableOption "ChromaDB, an open-source AI application database.";
 
-      package = mkOption {
+      package = mkPackageOption pkgs [ "python3Packages" "chromadb" ] { };
-        type = types.package;
-        example = literalExpression "pkgs.python3Packages.chromadb";
-        default = pkgs.python3Packages.chromadb;
-        defaultText = "pkgs.python3Packages.chromadb";
-        description = "ChromaDB package to use.";
-      };
 
       host = mkOption {
         type = types.str;

nixos/modules/services/databases/ferretdb.nix

@@ -18,13 +18,7 @@ in
     services.ferretdb = {
       enable = lib.mkEnableOption "FerretDB, an Open Source MongoDB alternative";
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "ferretdb" { };
-        type = lib.types.package;
-        example = lib.literalExpression "pkgs.ferretdb";
-        default = pkgs.ferretdb;
-        defaultText = "pkgs.ferretdb";
-        description = "FerretDB package to use.";
-      };
 
       settings = lib.mkOption {
         type = lib.types.submodule {

nixos/modules/services/development/lorri.nix

@@ -21,14 +21,7 @@ in
           issued by the `lorri` command.
         '';
       };
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "lorri" { };
-        default = pkgs.lorri;
-        type = lib.types.package;
-        description = ''
-          The lorri package to use.
-        '';
-        defaultText = lib.literalExpression "pkgs.lorri";
-      };
     };
   };
 

nixos/modules/services/hardware/argonone.nix

@@ -11,14 +11,7 @@ in
 {
   options.services.hardware.argonone = {
     enable = lib.mkEnableOption "the driver for Argon One Raspberry Pi case fan and power button";
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "argononed" { };
-      type = lib.types.package;
-      default = pkgs.argononed;
-      defaultText = lib.literalExpression "pkgs.argononed";
-      description = ''
-        The package implementing the Argon One driver
-      '';
-    };
   };
 
   config = lib.mkIf cfg.enable {

nixos/modules/services/hardware/sane.nix

@@ -67,12 +67,7 @@ in
       '';
     };
 
-    hardware.sane.backends-package = lib.mkOption {
+    hardware.sane.backends-package = lib.mkPackageOption pkgs "sane-backends" { };
-      type = lib.types.package;
-      default = pkgs.sane-backends;
-      defaultText = lib.literalExpression "pkgs.sane-backends";
-      description = "Backends driver package to use.";
-    };
 
     hardware.sane.snapshot = lib.mkOption {
       type = lib.types.bool;

nixos/modules/services/matrix/mautrix-discord.nix

@@ -19,14 +19,7 @@ in
     services.mautrix-discord = {
       enable = lib.mkEnableOption "Mautrix-Discord, a Matrix-Discord puppeting/relay-bot bridge";
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "mautrix-discord" { };
-        type = lib.types.package;
-        default = pkgs.mautrix-discord;
-        defaultText = lib.literalExpression "pkgs.mautrix-discord";
-        description = ''
-          The mautrix-discord package to use.
-        '';
-      };
 
       settings = lib.mkOption {
         type = lib.types.submodule {

nixos/modules/services/misc/etebase-server.nix

@@ -51,12 +51,7 @@ in
         '';
       };
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "etebase-server" { };
-        type = lib.types.package;
-        default = pkgs.etebase-server;
-        defaultText = lib.literalExpression "pkgs.python3.pkgs.etebase-server";
-        description = "etebase-server package to use.";
-      };
 
       dataDir = lib.mkOption {
         type = lib.types.str;

nixos/modules/services/misc/invidious-router.nix

@@ -70,14 +70,7 @@ in
         for configuration options.
       '';
     };
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "invidious-router" { };
-      type = lib.types.package;
-      default = pkgs.invidious-router;
-      defaultText = lib.literalExpression "pkgs.invidious-router";
-      description = ''
-        The invidious-router package to use.
-      '';
-    };
     nginx = {
       enable = lib.mkEnableOption ''
         Automatic nginx proxy configuration

nixos/modules/services/misc/portunus.nix

@@ -117,12 +117,7 @@ in
     };
 
     ldap = {
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "openldap" { };
-        type = lib.types.package;
-        default = pkgs.openldap;
-        defaultText = lib.literalExpression "pkgs.openldap";
-        description = "The OpenLDAP package to use.";
-      };
 
       searchUserName = lib.mkOption {
         type = lib.types.str;

nixos/modules/services/networking/ax25/axlisten.nix

@@ -17,7 +17,7 @@ let
   inherit (lib.options)
     mkEnableOption
     mkOption
-    literalExpression
+    mkPackageOption
     ;
 
   cfg = config.services.ax25.axlisten;
@@ -29,12 +29,7 @@ in
 
       enable = mkEnableOption "AX.25 axlisten daemon";
 
-      package = mkOption {
+      package = mkPackageOption pkgs "ax25-apps" { };
-        type = types.package;
-        default = pkgs.ax25-apps;
-        defaultText = literalExpression "pkgs.ax25-apps";
-        description = "The ax25-apps package to use.";
-      };
 
       config = mkOption {
         type = types.str;

nixos/modules/services/networking/deconz.nix

@@ -21,12 +21,7 @@ in
 
     enable = lib.mkEnableOption "deCONZ, a Zigbee gateway for use with ConBee/RaspBee hardware (https://phoscon.de/)";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "deconz" { };
-      type = lib.types.package;
-      default = pkgs.deconz;
-      defaultText = lib.literalExpression "pkgs.deconz";
-      description = "Which deCONZ package to use.";
-    };
 
     device = lib.mkOption {
       type = lib.types.nullOr lib.types.str;

nixos/modules/services/networking/firefox-syncserver.nix

@@ -101,14 +101,7 @@ in
         {option}`${opt.singleNode.enable}` does this automatically when enabled
       '';
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "syncstorage-rs" { };
-        type = lib.types.package;
-        default = pkgs.syncstorage-rs;
-        defaultText = lib.literalExpression "pkgs.syncstorage-rs";
-        description = ''
-          Package to use.
-        '';
-      };
 
       database.name = lib.mkOption {
         # the mysql module does not allow `-quoting without resorting to shell

nixos/modules/services/networking/mycelium.nix

@@ -39,12 +39,7 @@ in
       default = false;
       description = "Open the firewall for mycelium";
     };
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "mycelium" { };
-      type = lib.types.package;
-      default = pkgs.mycelium;
-      defaultText = lib.literalExpression ''"''${pkgs.mycelium}"'';
-      description = "The mycelium package to use";
-    };
     addHostedPublicNodes = lib.mkOption {
       type = lib.types.bool;
       default = true;

nixos/modules/services/networking/onedrive.nix

@@ -31,14 +31,7 @@ in
   options.services.onedrive = {
     enable = lib.mkEnableOption "OneDrive service";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "onedrive" { };
-      type = lib.types.package;
-      default = pkgs.onedrive;
-      defaultText = lib.literalExpression "pkgs.onedrive";
-      description = ''
-        OneDrive package to use.
-      '';
-    };
   };
   ### Implementation
 

nixos/modules/services/networking/shorewall.nix

@@ -24,12 +24,7 @@ in
           :::
         '';
       };
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "shorewall" { };
-        type = types.package;
-        default = pkgs.shorewall;
-        defaultText = lib.literalExpression "pkgs.shorewall";
-        description = "The shorewall package to use.";
-      };
       configs = lib.mkOption {
         type = types.attrsOf types.lines;
         default = { };

nixos/modules/services/networking/shorewall6.nix

@@ -24,12 +24,7 @@ in
           :::
         '';
       };
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "shorewall" { };
-        type = types.package;
-        default = pkgs.shorewall;
-        defaultText = lib.literalExpression "pkgs.shorewall";
-        description = "The shorewall package to use.";
-      };
       configs = lib.mkOption {
         type = types.attrsOf types.lines;
         default = { };

nixos/modules/services/networking/sitespeed-io.nix

@@ -18,12 +18,7 @@ in
       description = "User account under which sitespeed-io runs.";
     };
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "sitespeed-io" { };
-      type = lib.types.package;
-      default = pkgs.sitespeed-io;
-      defaultText = "pkgs.sitespeed-io";
-      description = "Sitespeed.io package to use.";
-    };
 
     dataDir = lib.mkOption {
       default = "/var/lib/sitespeed-io";

nixos/modules/services/networking/syncplay.nix

@@ -290,14 +290,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "syncplay-nogui" { };
-        type = types.package;
-        default = pkgs.syncplay-nogui;
-        defaultText = literalExpression "pkgs.syncplay-nogui";
-        description = ''
-          Package to use for syncplay.
-        '';
-      };
     };
   };
 

nixos/modules/services/networking/x2goserver.nix

@@ -37,14 +37,7 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "x2goserver" { };
-      type = types.package;
-      default = pkgs.x2goserver;
-      defaultText = literalExpression "pkgs.x2goserver";
-      description = ''
-        The x2goserver package to use.
-      '';
-    };
 
     superenicer = {
       enable = mkEnableOption "superenicer" // {

nixos/modules/services/networking/zenohd.nix

@@ -10,6 +10,7 @@ let
     types
     mkDefault
     mkOption
+    mkPackageOption
     ;
 
   json = pkgs.formats.json { };
@@ -22,12 +23,7 @@ in
     services.zenohd = {
       enable = lib.mkEnableOption "Zenoh daemon.";
 
-      package = mkOption {
+      package = mkPackageOption pkgs "zenoh" { };
-        description = "The zenoh package to use.";
-        type = types.package;
-        default = pkgs.zenoh;
-        defaultText = "pkgs.zenoh";
-      };
 
       settings = mkOption {
         description = ''

nixos/modules/services/security/step-ca.nix

@@ -15,12 +15,7 @@ in
     services.step-ca = {
       enable = lib.mkEnableOption "the smallstep certificate authority server";
       openFirewall = lib.mkEnableOption "opening the certificate authority server port";
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "step-ca" { };
-        type = lib.types.package;
-        default = pkgs.step-ca;
-        defaultText = lib.literalExpression "pkgs.step-ca";
-        description = "Which step-ca package to use.";
-      };
       address = lib.mkOption {
         type = lib.types.str;
         example = "127.0.0.1";

nixos/modules/services/security/tang.nix

@@ -11,12 +11,7 @@ in
   options.services.tang = {
     enable = lib.mkEnableOption "tang";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "tang" { };
-      type = lib.types.package;
-      default = pkgs.tang;
-      defaultText = lib.literalExpression "pkgs.tang";
-      description = "The tang package to use.";
-    };
 
     listenStream = lib.mkOption {
       type = with lib.types; listOf str;

nixos/modules/services/security/vaultwarden/default.nix

@@ -197,12 +197,7 @@ in
 
     package = lib.mkPackageOption pkgs "vaultwarden" { };
 
-    webVaultPackage = lib.mkOption {
+    webVaultPackage = lib.mkPackageOption pkgs [ "vaultwarden" "webvault" ] { };
-      type = lib.types.package;
-      default = pkgs.vaultwarden.webvault;
-      defaultText = lib.literalExpression "pkgs.vaultwarden.webvault";
-      description = "Web vault package to use.";
-    };
   };
 
   config = lib.mkIf cfg.enable {

nixos/modules/services/web-apps/baikal.nix

@@ -44,23 +44,8 @@ in
           Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
         '';
       };
-      phpPackage = lib.mkOption {
+      phpPackage = lib.mkPackageOption pkgs "php" { };
-        type = lib.types.package;
+      package = lib.mkPackageOption pkgs "baikal" { };
-        default = pkgs.php;
-        defaultText = "pkgs.php";
-        description = ''
-          php package to use for php fpm daemon.
-        '';
-      };
-      package = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.baikal;
-        defaultText = "pkgs.baikal";
-        description = ''
-          Baikal package to use.
-        '';
-      };
-
     };
   };
   config = lib.mkIf cfg.enable {

nixos/modules/services/web-apps/castopod.nix

@@ -32,12 +32,7 @@ in
   options.services = {
     castopod = {
       enable = lib.mkEnableOption "Castopod, a hosting platform for podcasters";
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "castopod" { };
-        type = lib.types.package;
-        default = pkgs.castopod;
-        defaultText = lib.literalMD "pkgs.castopod";
-        description = "Which Castopod package to use.";
-      };
       dataDir = lib.mkOption {
         type = lib.types.path;
         default = "/var/lib/castopod";

nixos/modules/services/web-apps/mastodon.nix

@@ -706,12 +706,7 @@ in
         };
       };
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "mastodon" { };
-        type = lib.types.package;
-        default = pkgs.mastodon;
-        defaultText = lib.literalExpression "pkgs.mastodon";
-        description = "Mastodon package to use.";
-      };
 
       extraConfig = lib.mkOption {
         type = lib.types.attrs;

nixos/modules/services/web-apps/nextcloud-notify_push.nix

@@ -14,12 +14,7 @@ in
   options.services.nextcloud.notify_push = {
     enable = lib.mkEnableOption "Notify push";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "nextcloud-notify_push" { };
-      type = lib.types.package;
-      default = pkgs.nextcloud-notify_push;
-      defaultText = lib.literalMD "pkgs.nextcloud-notify_push";
-      description = "Which package to use for notify_push";
-    };
 
     socketPath = lib.mkOption {
       type = lib.types.str;

nixos/modules/services/web-apps/nifi.nix

@@ -37,12 +37,7 @@ in
     services.nifi = {
       enable = lib.mkEnableOption "Apache NiFi";
 
-      package = lib.mkOption {
+      package = lib.mkPackageOption pkgs "nifi" { };
-        type = lib.types.package;
-        default = pkgs.nifi;
-        defaultText = lib.literalExpression "pkgs.nifi";
-        description = "Apache NiFi package to use.";
-      };
 
       user = lib.mkOption {
         type = lib.types.str;

nixos/modules/services/web-apps/peertube.nix

@@ -338,12 +338,7 @@ in
       };
     };
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "peertube" { };
-      type = lib.types.package;
-      default = pkgs.peertube;
-      defaultText = lib.literalExpression "pkgs.peertube";
-      description = "PeerTube package to use.";
-    };
   };
 
   config = lib.mkIf cfg.enable {

nixos/modules/services/web-apps/writefreely.nix

@@ -152,12 +152,7 @@ in
   options.services.writefreely = {
     enable = lib.mkEnableOption "Writefreely, build a digital writing community";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "writefreely" { };
-      type = lib.types.package;
-      default = pkgs.writefreely;
-      defaultText = lib.literalExpression "pkgs.writefreely";
-      description = "Writefreely package to use.";
-    };
 
     stateDir = mkOption {
       type = types.path;

nixos/modules/services/web-apps/youtrack.nix

@@ -51,14 +51,7 @@ in
       type = lib.types.str;
     };
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "youtrack" { };
-      description = ''
-        Package to use.
-      '';
-      type = lib.types.package;
-      default = pkgs.youtrack;
-      defaultText = lib.literalExpression "pkgs.youtrack";
-    };
 
     statePath = lib.mkOption {
       description = ''

nixos/modules/services/web-servers/keter/default.nix

@@ -31,12 +31,7 @@ in
       description = "Mutable state folder for keter";
     };
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs [ "haskellPackages" "keter" ] { };
-      type = lib.types.package;
-      default = pkgs.haskellPackages.keter;
-      defaultText = lib.literalExpression "pkgs.haskellPackages.keter";
-      description = "The keter package to be used";
-    };
 
     globalKeterConfig = lib.mkOption {
       type = lib.types.submodule {

nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix

@@ -38,15 +38,7 @@ in
       };
 
       theme = {
-        package = mkOption {
+        package = mkPackageOption pkgs "gnome-themes-extra" { };
-          type = types.package;
-          default = pkgs.gnome-themes-extra;
-          defaultText = literalExpression "pkgs.gnome-themes-extra";
-          description = ''
-            The package path that contains the theme given in the name option.
-          '';
-        };
-
         name = mkOption {
           type = types.str;
           default = "Adwaita";
@@ -57,15 +49,7 @@ in
       };
 
       iconTheme = {
-        package = mkOption {
+        package = mkPackageOption pkgs "papirus-icon-theme" { };
-          type = types.package;
-          default = pkgs.papirus-icon-theme;
-          defaultText = literalExpression "pkgs.papirus-icon-theme";
-          description = ''
-            The package path that contains the icon theme given in the name option.
-          '';
-        };
-
         name = mkOption {
           type = types.str;
           default = "ePapirus";
@@ -76,15 +60,7 @@ in
       };
 
       cursorTheme = {
-        package = mkOption {
+        package = mkPackageOption pkgs "capitaine-cursors" { };
-          type = types.package;
-          default = pkgs.capitaine-cursors;
-          defaultText = literalExpression "pkgs.capitaine-cursors";
-          description = ''
-            The package path that contains the cursor theme given in the name option.
-          '';
-        };
-
         name = mkOption {
           type = types.str;
           default = "capitane-cursors";

nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix

@@ -49,14 +49,7 @@ in
 
       theme = {
 
-        package = mkOption {
+        package = mkPackageOption pkgs "gnome-themes-extra" { };
-          type = types.package;
-          default = pkgs.gnome-themes-extra;
-          defaultText = literalExpression "pkgs.gnome-themes-extra";
-          description = ''
-            The package path that contains the theme given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;
@@ -70,14 +63,7 @@ in
 
       iconTheme = {
 
-        package = mkOption {
+        package = mkPackageOption pkgs "adwaita-icon-theme" { };
-          type = types.package;
-          default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
-          description = ''
-            The package path that contains the icon theme given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;
@@ -91,14 +77,7 @@ in
 
       cursorTheme = {
 
-        package = mkOption {
+        package = mkPackageOption pkgs "adwaita-icon-theme" { };
-          type = types.package;
-          default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
-          description = ''
-            The package path that contains the cursor theme given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;

nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix

@@ -36,14 +36,7 @@ in
       enable = mkEnableOption "lightdm-slick-greeter as the lightdm greeter";
 
       theme = {
-        package = mkOption {
+        package = mkPackageOption pkgs "gnome-themes-extra" { };
-          type = types.package;
-          default = pkgs.gnome-themes-extra;
-          defaultText = literalExpression "pkgs.gnome-themes-extra";
-          description = ''
-            The package path that contains the theme given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;
@@ -55,14 +48,7 @@ in
       };
 
       iconTheme = {
-        package = mkOption {
+        package = mkPackageOption pkgs "adwaita-icon-theme" { };
-          type = types.package;
-          default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
-          description = ''
-            The package path that contains the icon theme given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;
@@ -74,14 +60,7 @@ in
       };
 
       font = {
-        package = mkOption {
+        package = mkPackageOption pkgs "ubuntu-classic" { };
-          type = types.package;
-          default = pkgs.ubuntu-classic;
-          defaultText = literalExpression "pkgs.ubuntu-classic";
-          description = ''
-            The package path that contains the font given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;
@@ -93,14 +72,7 @@ in
       };
 
       cursorTheme = {
-        package = mkOption {
+        package = mkPackageOption pkgs "adwaita-icon-theme" { };
-          type = types.package;
-          default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
-          description = ''
-            The package path that contains the cursor theme given in the name option.
-          '';
-        };
 
         name = mkOption {
           type = types.str;

nixos/modules/services/x11/window-managers/nimdow.nix

@@ -13,12 +13,7 @@ in
 {
   options = {
     services.xserver.windowManager.nimdow.enable = mkEnableOption "nimdow";
-    services.xserver.windowManager.nimdow.package = mkOption {
+    services.xserver.windowManager.nimdow.package = mkPackageOption pkgs "nimdow" { };
-      type = types.package;
-      default = pkgs.nimdow;
-      defaultText = "pkgs.nimdow";
-      description = "nimdow package to use";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/xscreensaver.nix

@@ -12,12 +12,7 @@ in
   options.services.xscreensaver = {
     enable = lib.mkEnableOption "xscreensaver user service";
 
-    package = lib.mkOption {
+    package = lib.mkPackageOption pkgs "xscreensaver" { };
-      type = lib.types.package;
-      default = pkgs.xscreensaver;
-      defaultText = lib.literalExpression "pkgs.xscreensaver";
-      description = "Which xscreensaver package to use.";
-    };
   };
 
   config = lib.mkIf cfg.enable {

nixos/modules/system/boot/clevis.nix

@@ -22,12 +22,7 @@ in
   options = {
     boot.initrd.clevis.enable = lib.mkEnableOption "Clevis in initrd";
 
-    boot.initrd.clevis.package = lib.mkOption {
+    boot.initrd.clevis.package = lib.mkPackageOption pkgs "clevis" { };
-      type = lib.types.package;
-      default = pkgs.clevis;
-      defaultText = "pkgs.clevis";
-      description = "Clevis package";
-    };
 
     boot.initrd.clevis.devices = lib.mkOption {
       description = "Encrypted devices that need to be unlocked at boot using Clevis";