treewide: use mkPackageOption

This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.

nixos/modules/hardware/ckb-next.nix

@@ -24,14 +24,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "ckb-next" { };
-        type = types.package;
-        default = pkgs.ckb-next;
-        defaultText = literalExpression "pkgs.ckb-next";
-        description = lib.mdDoc ''
-          The package implementing the Corsair keyboard/mouse driver.
-        '';
-      };
     };
 
     config = mkIf cfg.enable {

nixos/modules/hardware/digitalbitbox.nix

@@ -16,11 +16,10 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "digitalbitbox" {
-      type = types.package;
+      extraDescription = ''
-      default = pkgs.digitalbitbox;
+        This can be used to install a package with udev rules that differ from the defaults.
-      defaultText = literalExpression "pkgs.digitalbitbox";
+      '';
-      description = lib.mdDoc "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
     };
   };
 

nixos/modules/hardware/opentabletdriver.nix

@@ -26,14 +26,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "opentabletdriver" { };
-        type = types.package;
-        default = pkgs.opentabletdriver;
-        defaultText = literalExpression "pkgs.opentabletdriver";
-        description = lib.mdDoc ''
-          OpenTabletDriver derivation to use.
-        '';
-      };
 
       daemon = {
         enable = mkOption {

nixos/modules/misc/locate.nix

@@ -26,14 +26,8 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs [ "findutils" "locate" ] {
-      type = package;
+      example = "mlocate";
-      default = pkgs.findutils.locate;
-      defaultText = literalExpression "pkgs.findutils.locate";
-      example = literalExpression "pkgs.mlocate";
-      description = lib.mdDoc ''
-        The locate implementation to use
-      '';
     };
 
     interval = mkOption {

nixos/modules/programs/atop.nix

@@ -16,14 +16,7 @@ in
 
       enable = mkEnableOption (lib.mdDoc "Atop");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "atop" { };
-        type = types.package;
-        default = pkgs.atop;
-        defaultText = literalExpression "pkgs.atop";
-        description = lib.mdDoc ''
-          Which package to use for Atop.
-        '';
-      };
 
       netatop = {
         enable = mkOption {

nixos/modules/programs/captive-browser.nix

@@ -5,7 +5,8 @@ let
 
   inherit (lib)
     concatStringsSep escapeShellArgs optionalString
-    literalExpression mkEnableOption mkIf mkOption mkOptionDefault types;
+    literalExpression mkEnableOption mkPackageOption mkIf mkOption
+    mkOptionDefault types;
 
   requiresSetcapWrapper = config.boot.kernelPackages.kernelOlder "5.7" && cfg.bindInterface;
 
@@ -50,12 +51,7 @@ in
     programs.captive-browser = {
       enable = mkEnableOption (lib.mdDoc "captive browser");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "captive-browser" { };
-        type = types.package;
-        default = pkgs.captive-browser;
-        defaultText = literalExpression "pkgs.captive-browser";
-        description = lib.mdDoc "Which package to use for captive-browser";
-      };
 
       interface = mkOption {
         type = types.str;

nixos/modules/programs/digitalbitbox/default.nix

@@ -16,11 +16,10 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "digitalbitbox" {
-      type = types.package;
+      extraDescription = ''
-      default = pkgs.digitalbitbox;
+        This can be used to install a package with udev rules that differ from the defaults.
-      defaultText = literalExpression "pkgs.digitalbitbox";
+      '';
-      description = lib.mdDoc "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
     };
   };
 

nixos/modules/programs/dmrconfig.nix

@@ -21,12 +21,7 @@ in {
         relatedPackages = [ "dmrconfig" ];
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "dmrconfig" { };
-        default = pkgs.dmrconfig;
-        type = types.package;
-        defaultText = literalExpression "pkgs.dmrconfig";
-        description = lib.mdDoc "dmrconfig derivation to use";
-      };
     };
   };
 

nixos/modules/programs/evince.nix

@@ -24,12 +24,7 @@ in {
       enable = mkEnableOption
         (lib.mdDoc "Evince, the GNOME document viewer");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "evince" { };
-        type = types.package;
-        default = pkgs.evince;
-        defaultText = literalExpression "pkgs.evince";
-        description = lib.mdDoc "Evince derivation to use.";
-      };
 
     };
 

nixos/modules/programs/feedbackd.nix

@@ -12,14 +12,7 @@ in {
 
         Your user needs to be in the `feedbackd` group to trigger effects
       '');
-      package = mkOption {
+      package = mkPackageOption pkgs "feedbackd" { };
-        description = lib.mdDoc ''
-          Which feedbackd package to use.
-        '';
-        type = types.package;
-        default = pkgs.feedbackd;
-        defaultText = literalExpression "pkgs.feedbackd";
-      };
     };
   };
   config = mkIf cfg.enable {

nixos/modules/programs/file-roller.nix

@@ -23,12 +23,7 @@ in {
 
       enable = mkEnableOption (lib.mdDoc "File Roller, an archive manager for GNOME");
 
-      package = mkOption {
+      package = mkPackageOption pkgs [ "gnome" "file-roller" ] { };
-        type = types.package;
-        default = pkgs.gnome.file-roller;
-        defaultText = literalExpression "pkgs.gnome.file-roller";
-        description = lib.mdDoc "File Roller derivation to use.";
-      };
 
     };
 

nixos/modules/programs/flexoptix-app.nix

@@ -9,12 +9,7 @@ in {
     programs.flexoptix-app = {
       enable = mkEnableOption (lib.mdDoc "FLEXOPTIX app + udev rules");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "flexoptix-app" { };
-        description = lib.mdDoc "FLEXOPTIX app package to use";
-        type = types.package;
-        default = pkgs.flexoptix-app;
-        defaultText = literalExpression "pkgs.flexoptix-app";
-      };
     };
   };
 

nixos/modules/programs/gamescope.nix

@@ -23,14 +23,7 @@ in
   options.programs.gamescope = {
     enable = mkEnableOption (mdDoc "gamescope");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "gamescope" { };
-      type = types.package;
-      default = pkgs.gamescope;
-      defaultText = literalExpression "pkgs.gamescope";
-      description = mdDoc ''
-        The GameScope package to use.
-      '';
-    };
 
     capSysNice = mkOption {
       type = types.bool;

nixos/modules/programs/git.nix

@@ -11,12 +11,8 @@ in
     programs.git = {
       enable = mkEnableOption (lib.mdDoc "git");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "git" {
-        type = types.package;
+        example = "gitFull";
-        default = pkgs.git;
-        defaultText = literalExpression "pkgs.git";
-        example = literalExpression "pkgs.gitFull";
-        description = lib.mdDoc "The git package to use";
       };
 
       config = mkOption {
@@ -65,12 +61,7 @@ in
       lfs = {
         enable = mkEnableOption (lib.mdDoc "git-lfs");
 
-        package = mkOption {
+        package = mkPackageOption pkgs "git-lfs" { };
-          type = types.package;
-          default = pkgs.git-lfs;
-          defaultText = literalExpression "pkgs.git-lfs";
-          description = lib.mdDoc "The git-lfs package to use";
-        };
       };
     };
   };

nixos/modules/programs/gnupg.nix

@@ -29,14 +29,7 @@ in
 {
 
   options.programs.gnupg = {
-    package = mkOption {
+    package = mkPackageOption pkgs "gnupg" { };
-      type = types.package;
-      default = pkgs.gnupg;
-      defaultText = literalExpression "pkgs.gnupg";
-      description = lib.mdDoc ''
-        The gpg package that should be used.
-      '';
-    };
 
     agent.enable = mkOption {
       type = types.bool;

nixos/modules/programs/htop.nix

@@ -18,14 +18,7 @@ in
 {
 
   options.programs.htop = {
-    package = mkOption {
+    package = mkPackageOption pkgs "htop" { };
-      type = types.package;
-      default = pkgs.htop;
-      defaultText = lib.literalExpression "pkgs.htop";
-      description = lib.mdDoc ''
-        The htop package that should be used.
-      '';
-    };
 
     enable = mkEnableOption (lib.mdDoc "htop process monitor");
 

nixos/modules/programs/i3lock.nix

@@ -13,16 +13,12 @@ in {
   options = {
     programs.i3lock = {
       enable = mkEnableOption (mdDoc "i3lock");
-      package = mkOption {
+      package = mkPackageOption pkgs "i3lock" {
-        type        = types.package;
+        example = "i3lock-color";
-        default     = pkgs.i3lock;
+        extraDescription = ''
-        defaultText = literalExpression "pkgs.i3lock";
+          ::: {.note}
-        example     = literalExpression ''
-          pkgs.i3lock-color
-        '';
-        description = mdDoc ''
-          Specify which package to use for the i3lock program,
           The i3lock package must include a i3lock file or link in its out directory in order for the u2fSupport option to work correctly.
+          :::
         '';
       };
       u2fSupport = mkOption {

nixos/modules/programs/java.nix

@@ -30,13 +30,8 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "jdk" {
-        default = pkgs.jdk;
+        example = "jre";
-        defaultText = literalExpression "pkgs.jdk";
-        description = lib.mdDoc ''
-          Java package to install. Typical values are pkgs.jdk or pkgs.jre.
-        '';
-        type = types.package;
       };
 
       binfmt = mkEnableOption (lib.mdDoc "binfmt to execute java jar's and classes");

nixos/modules/programs/k40-whisperer.nix

@@ -20,15 +20,7 @@ in
       default = "k40";
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "k40-whisperer" { };
-      type = types.package;
-      default = pkgs.k40-whisperer;
-      defaultText = literalExpression "pkgs.k40-whisperer";
-      example = literalExpression "pkgs.k40-whisperer";
-      description = lib.mdDoc ''
-        K40 Whisperer package to use.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/programs/kdeconnect.nix

@@ -11,14 +11,8 @@ with lib;
       `gnomeExtensions.gsconnect` as an alternative
       implementation if you use Gnome
     '');
-    package = mkOption {
+    package = mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] {
-      default = pkgs.plasma5Packages.kdeconnect-kde;
+      example = "gnomeExtensions.gsconnect";
-      defaultText = literalExpression "pkgs.plasma5Packages.kdeconnect-kde";
-      type = types.package;
-      example = literalExpression "pkgs.gnomeExtensions.gsconnect";
-      description = lib.mdDoc ''
-        The package providing the implementation for kdeconnect.
-      '';
     };
   };
   config =

nixos/modules/programs/mtr.nix

@@ -17,14 +17,7 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "mtr" { };
-        type = types.package;
-        default = pkgs.mtr;
-        defaultText = literalExpression "pkgs.mtr";
-        description = lib.mdDoc ''
-          The package to use.
-        '';
-      };
     };
   };
 

nixos/modules/programs/neovim.nix

@@ -86,12 +86,7 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "neovim-unwrapped" { };
-      type = types.package;
-      default = pkgs.neovim-unwrapped;
-      defaultText = literalExpression "pkgs.neovim-unwrapped";
-      description = lib.mdDoc "The package to use for the neovim binary.";
-    };
 
     finalPackage = mkOption {
       type = types.package;

nixos/modules/programs/nix-index.nix

@@ -5,12 +5,7 @@ in {
   options.programs.nix-index = with lib; {
     enable = mkEnableOption (lib.mdDoc "nix-index, a file database for nixpkgs");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "nix-index" { };
-      type = types.package;
-      default = pkgs.nix-index;
-      defaultText = literalExpression "pkgs.nix-index";
-      description = lib.mdDoc "Package providing the `nix-index` tool.";
-    };
 
     enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
       default = true;

nixos/modules/programs/nncp.nix

@@ -23,12 +23,7 @@ in {
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "nncp" { };
-      type = types.package;
-      default = pkgs.nncp;
-      defaultText = literalExpression "pkgs.nncp";
-      description = lib.mdDoc "The NNCP package to use system-wide.";
-    };
 
     secrets = mkOption {
       type = with types; listOf str;

nixos/modules/programs/noisetorch.nix

@@ -8,14 +8,7 @@ in
   options.programs.noisetorch = {
     enable = mkEnableOption (lib.mdDoc "noisetorch + setcap wrapper");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "noisetorch" { };
-      type = types.package;
-      default = pkgs.noisetorch;
-      defaultText = literalExpression "pkgs.noisetorch";
-      description = lib.mdDoc ''
-        The noisetorch package to use.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/programs/npm.nix

@@ -13,12 +13,8 @@ in
     programs.npm = {
       enable = mkEnableOption (lib.mdDoc "{command}`npm` global config");
 
-      package = mkOption {
+      package = mkPackageOption pkgs [ "nodePackages" "npm" ] {
-        type = types.package;
+        example = "nodePackages_13_x.npm";
-        description = lib.mdDoc "The npm package version / flavor to use";
-        default = pkgs.nodePackages.npm;
-        defaultText = literalExpression "pkgs.nodePackages.npm";
-        example = literalExpression "pkgs.nodePackages_13_x.npm";
       };
 
       npmrc = mkOption {

nixos/modules/programs/proxychains.nix

@@ -51,8 +51,8 @@ in {
 
       enable = mkEnableOption (lib.mdDoc "installing proxychains configuration");
 
-      package = mkPackageOptionMD pkgs "proxychains" {
+      package = mkPackageOption pkgs "proxychains" {
-        example = "pkgs.proxychains-ng";
+        example = "proxychains-ng";
       };
 
       chain = {

nixos/modules/programs/singularity.nix

@@ -12,14 +12,8 @@ in
         Whether to install Singularity/Apptainer with system-level overriding such as SUID support.
       '';
     };
-    package = mkOption {
+    package = mkPackageOption pkgs "singularity" {
-      type = types.package;
+      example = "apptainer";
-      default = pkgs.singularity;
-      defaultText = literalExpression "pkgs.singularity";
-      example = literalExpression "pkgs.apptainer";
-      description = mdDoc ''
-        Singularity/Apptainer package to override and install.
-      '';
     };
     packageOverriden = mkOption {
       type = types.nullOr types.package;

nixos/modules/programs/ssh.nix

@@ -132,14 +132,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "openssh" { };
-        type = types.package;
-        default = pkgs.openssh;
-        defaultText = literalExpression "pkgs.openssh";
-        description = lib.mdDoc ''
-          The package used for the openssh client and daemon.
-        '';
-      };
 
       knownHosts = mkOption {
         default = {};

nixos/modules/programs/tsm-client.nix

@@ -5,7 +5,7 @@ let
   inherit (builtins) length map;
   inherit (lib.attrsets) attrNames filterAttrs hasAttr mapAttrs mapAttrsToList optionalAttrs;
   inherit (lib.modules) mkDefault mkIf;
-  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib.options) literalExpression mkEnableOption mkOption mkPackageOption;
   inherit (lib.strings) concatLines optionalString toLower;
   inherit (lib.types) addCheck attrsOf lines nonEmptyStr nullOr package path port str strMatching submodule;
 
@@ -215,14 +215,9 @@ let
         TSM-depending packages used on the system.
       '';
     };
-    package = mkOption {
+    package = mkPackageOption pkgs "tsm-client" {
-      type = package;
+      example = "tsm-client-withGui";
-      default = pkgs.tsm-client;
+      extraDescription = ''
-      defaultText = literalExpression "pkgs.tsm-client";
-      example = literalExpression "pkgs.tsm-client-withGui";
-      description = lib.mdDoc ''
-        The TSM client derivation to be
-        added to the system environment.
         It will be used with `.override`
         to add paths to the client system-options file.
       '';

nixos/modules/programs/vim.nix

@@ -15,14 +15,8 @@ in {
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "vim" {
-      type = types.package;
+      example = "vim-full";
-      default = pkgs.vim;
-      defaultText = literalExpression "pkgs.vim";
-      example = literalExpression "pkgs.vim-full";
-      description = lib.mdDoc ''
-        vim package to use.
-      '';
     };
   };
 

nixos/modules/programs/wayland/river.nix

@@ -10,12 +10,9 @@ in {
   options.programs.river = {
     enable = mkEnableOption (lib.mdDoc "river, a dynamic tiling Wayland compositor");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "river" {
-      type = with types; nullOr package;
+      nullable = true;
-      default = pkgs.river;
+      extraDescription = ''
-      defaultText = literalExpression "pkgs.river";
-      description = lib.mdDoc ''
-        River package to use.
         Set to `null` to not add any River package to your path.
         This should be done if you want to use the Home Manager River module to install River.
       '';

nixos/modules/programs/weylus.nix

@@ -26,12 +26,7 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "weylus" { };
-      type = package;
-      default = pkgs.weylus;
-      defaultText = lib.literalExpression "pkgs.weylus";
-      description = lib.mdDoc "Weylus package to install.";
-    };
   };
   config = mkIf cfg.enable {
     networking.firewall = mkIf cfg.openFirewall {

nixos/modules/programs/wireshark.nix

@@ -16,13 +16,8 @@ in {
           setcap wrapper for 'dumpcap' for users in the 'wireshark' group.
         '';
       };
-      package = mkOption {
+      package = mkPackageOption pkgs "wireshark-cli" {
-        type = types.package;
+        example = "wireshark";
-        default = pkgs.wireshark-cli;
-        defaultText = literalExpression "pkgs.wireshark-cli";
-        description = lib.mdDoc ''
-          Which Wireshark package to install in the global environment.
-        '';
       };
     };
   };

nixos/modules/programs/xonsh.nix

@@ -24,14 +24,8 @@ in
         type = types.bool;
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "xonsh" {
-        type = types.package;
+        example = "xonsh.override { extraPackages = ps: [ ps.requests ]; }";
-        default = pkgs.xonsh;
-        defaultText = literalExpression "pkgs.xonsh";
-        example = literalExpression "pkgs.xonsh.override { extraPackages = ps: [ ps.requests ]; }";
-        description = lib.mdDoc ''
-          xonsh package to use.
-        '';
       };
 
       config = mkOption {

nixos/modules/programs/zsh/oh-my-zsh.nix

@@ -46,15 +46,7 @@ in
           '';
         };
 
-        package = mkOption {
+        package = mkPackageOption pkgs "oh-my-zsh" { };
-          default = pkgs.oh-my-zsh;
-          defaultText = literalExpression "pkgs.oh-my-zsh";
-          description = lib.mdDoc ''
-            Package to install for `oh-my-zsh` usage.
-          '';
-
-          type = types.package;
-        };
 
         plugins = mkOption {
           default = [];

nixos/modules/programs/zsh/zsh-autoenv.nix

@@ -8,15 +8,7 @@ in {
   options = {
     programs.zsh.zsh-autoenv = {
       enable = mkEnableOption (lib.mdDoc "zsh-autoenv");
-      package = mkOption {
+      package = mkPackageOption pkgs "zsh-autoenv" { };
-        default = pkgs.zsh-autoenv;
-        defaultText = literalExpression "pkgs.zsh-autoenv";
-        description = lib.mdDoc ''
-          Package to install for `zsh-autoenv` usage.
-        '';
-
-        type = types.package;
-      };
     };
   };
 

nixos/modules/security/please.nix

@@ -13,14 +13,7 @@ in
       file as another user
     '');
 
-    package = mkOption {
+    package = mkPackageOption pkgs "please" { };
-      type = types.package;
-      default = pkgs.please;
-      defaultText = literalExpression "pkgs.please";
-      description = mdDoc ''
-        Which package to use for {command}`please`.
-      '';
-    };
 
     wheelNeedsPassword = mkOption {
       type = types.bool;

nixos/modules/security/sudo-rs.nix

@@ -60,14 +60,7 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "sudo-rs" { };
-      type = types.package;
-      default = pkgs.sudo-rs;
-      defaultText = literalExpression "pkgs.sudo-rs";
-      description = mdDoc ''
-        Which package to use for `sudo`.
-      '';
-    };
 
     wheelNeedsPassword = mkOption {
       type = types.bool;

nixos/modules/services/admin/meshcentral.nix

@@ -6,12 +6,7 @@ let
 in with lib; {
   options.services.meshcentral = with types; {
     enable = mkEnableOption (lib.mdDoc "MeshCentral computer management server");
-    package = mkOption {
+    package = mkPackageOption pkgs "meshcentral" { };
-      description = lib.mdDoc "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality.";
-      type = types.package;
-      default = pkgs.meshcentral;
-      defaultText = literalExpression "pkgs.meshcentral";
-    };
     settings = mkOption {
       description = lib.mdDoc ''
         Settings for MeshCentral. Refer to upstream documentation for details:

nixos/modules/services/amqp/rabbitmq.nix

@@ -26,14 +26,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "rabbitmq-server" { };
-        default = pkgs.rabbitmq-server;
-        type = types.package;
-        defaultText = literalExpression "pkgs.rabbitmq-server";
-        description = lib.mdDoc ''
-          Which rabbitmq package to use.
-        '';
-      };
 
       listenAddress = mkOption {
         default = "127.0.0.1";

nixos/modules/services/audio/botamusique.nix

@@ -14,12 +14,7 @@ in
   options.services.botamusique = {
     enable = mkEnableOption (lib.mdDoc "botamusique, a bot to play audio streams on mumble");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "botamusique" { };
-      type = types.package;
-      default = pkgs.botamusique;
-      defaultText = literalExpression "pkgs.botamusique";
-      description = lib.mdDoc "The botamusique package to use.";
-    };
 
     settings = mkOption {
       type = with types; submodule {

nixos/modules/services/audio/jack.nix

@@ -20,16 +20,11 @@ in {
           JACK Audio Connection Kit. You need to add yourself to the "jackaudio" group
         '');
 
-        package = mkOption {
+        package = mkPackageOption pkgs "jack2" {
+          example = "jack1";
+        } // {
           # until jack1 promiscuous mode is fixed
           internal = true;
-          type = types.package;
-          default = pkgs.jack2;
-          defaultText = literalExpression "pkgs.jack2";
-          example = literalExpression "pkgs.jack1";
-          description = lib.mdDoc ''
-            The JACK package to use.
-          '';
         };
 
         extraOptions = mkOption {

nixos/modules/services/audio/jmusicbot.nix

@@ -9,12 +9,7 @@ in
     services.jmusicbot = {
       enable = mkEnableOption (lib.mdDoc "jmusicbot, a Discord music bot that's easy to set up and run yourself");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "jmusicbot" { };
-        type = types.package;
-        default = pkgs.jmusicbot;
-        defaultText = literalExpression "pkgs.jmusicbot";
-        description = lib.mdDoc "JMusicBot package to use";
-      };
 
       stateDir = mkOption {
         type = types.path;

nixos/modules/services/audio/slimserver.nix

@@ -19,12 +19,7 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "slimserver" { };
-        type = types.package;
-        default = pkgs.slimserver;
-        defaultText = literalExpression "pkgs.slimserver";
-        description = lib.mdDoc "Slimserver package to use.";
-      };
 
       dataDir = mkOption {
         type = types.path;

nixos/modules/services/backup/postgresql-wal-receiver.nix

@@ -5,12 +5,8 @@ with lib;
 let
   receiverSubmodule = {
     options = {
-      postgresqlPackage = mkOption {
+      postgresqlPackage = mkPackageOption pkgs "postgresql" {
-        type = types.package;
+        example = "postgresql_15";
-        example = literalExpression "pkgs.postgresql_15";
-        description = lib.mdDoc ''
-          PostgreSQL package to use.
-        '';
       };
 
       directory = mkOption {

nixos/modules/services/backup/restic-rest-server.nix

@@ -57,12 +57,7 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "restic-rest-server" { };
-      default = pkgs.restic-rest-server;
-      defaultText = literalExpression "pkgs.restic-rest-server";
-      type = types.package;
-      description = lib.mdDoc "Restic REST server package to use.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/backup/restic.nix

@@ -245,14 +245,7 @@ in
           '';
         };
 
-        package = mkOption {
+        package = mkPackageOption pkgs "restic" { };
-          type = types.package;
-          default = pkgs.restic;
-          defaultText = literalExpression "pkgs.restic";
-          description = lib.mdDoc ''
-            Restic package to use.
-          '';
-        };
 
         createWrapper = lib.mkOption {
           type = lib.types.bool;

nixos/modules/services/backup/zrepl.nix

@@ -13,12 +13,7 @@ in
     services.zrepl = {
       enable = mkEnableOption (lib.mdDoc "zrepl");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "zrepl" { };
-        type = types.package;
-        default = pkgs.zrepl;
-        defaultText = literalExpression "pkgs.zrepl";
-        description = lib.mdDoc "Which package to use for zrepl";
-      };
 
       settings = mkOption {
         default = { };

nixos/modules/services/blockchain/ethereum/geth.nix

@@ -135,12 +135,7 @@ let
         default = [];
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs [ "go-ethereum" "geth" ] { };
-        default = pkgs.go-ethereum.geth;
-        defaultText = literalExpression "pkgs.go-ethereum.geth";
-        type = types.package;
-        description = lib.mdDoc "Package to use as Go Ethereum node.";
-      };
     };
   };
 in

nixos/modules/services/cluster/corosync/default.nix

@@ -9,12 +9,7 @@ in
   options.services.corosync = {
     enable = mkEnableOption (lib.mdDoc "corosync");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "corosync" { };
-      type = types.package;
-      default = pkgs.corosync;
-      defaultText = literalExpression "pkgs.corosync";
-      description = lib.mdDoc "Package that should be used for corosync.";
-    };
 
     clusterName = mkOption {
       type = types.str;

nixos/modules/services/cluster/hadoop/default.nix

@@ -199,12 +199,7 @@ with lib;
 
     gatewayRole.enable = mkEnableOption (lib.mdDoc "gateway role for deploying hadoop configs");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "hadoop" { };
-      type = types.package;
-      default = pkgs.hadoop;
-      defaultText = literalExpression "pkgs.hadoop";
-      description = lib.mdDoc "";
-    };
   };
 
 

nixos/modules/services/cluster/hadoop/hbase.nix

@@ -134,12 +134,7 @@ in
 
     hbase = {
 
-      package = mkOption {
+      package = mkPackageOption pkgs "hbase" { };
-        type = types.package;
-        default = pkgs.hbase;
-        defaultText = literalExpression "pkgs.hbase";
-        description = mdDoc "HBase package";
-      };
 
       rootdir = mkOption {
         description = mdDoc ''

nixos/modules/services/cluster/k3s/default.nix

@@ -15,12 +15,7 @@ in
   options.services.k3s = {
     enable = mkEnableOption (lib.mdDoc "k3s");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "k3s" { };
-      type = types.package;
-      default = pkgs.k3s;
-      defaultText = literalExpression "pkgs.k3s";
-      description = lib.mdDoc "Package that should be used for k3s";
-    };
 
     role = mkOption {
       description = lib.mdDoc ''

nixos/modules/services/cluster/kubernetes/default.nix

@@ -122,12 +122,7 @@ in {
       type = types.listOf (types.enum ["master" "node"]);
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "kubernetes" { };
-      description = lib.mdDoc "Kubernetes package to use.";
-      type = types.package;
-      default = pkgs.kubernetes;
-      defaultText = literalExpression "pkgs.kubernetes";
-    };
 
     kubeconfig = mkKubeConfigOptions "Default kubeconfig";
 

nixos/modules/services/cluster/pacemaker/default.nix

@@ -9,12 +9,7 @@ in
   options.services.pacemaker = {
     enable = mkEnableOption (lib.mdDoc "pacemaker");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "pacemaker" { };
-      type = types.package;
-      default = pkgs.pacemaker;
-      defaultText = literalExpression "pkgs.pacemaker";
-      description = lib.mdDoc "Package that should be used for pacemaker.";
-    };
   };
 
   # implementation

nixos/modules/services/cluster/spark/default.nix

@@ -77,20 +77,18 @@ with lib;
         description = lib.mdDoc "Spark log directory.";
         default = "/var/log/spark";
       };
-      package = mkOption {
+      package = mkPackageOption pkgs "spark" {
-        type = types.package;
+        example = ''
-        description = lib.mdDoc "Spark package.";
+          spark.overrideAttrs (super: rec {
-        default = pkgs.spark;
+            pname = "spark";
-        defaultText = literalExpression "pkgs.spark";
+            version = "2.4.4";
-        example = literalExpression ''pkgs.spark.overrideAttrs (super: rec {
-          pname = "spark";
-          version = "2.4.4";
 
-          src = pkgs.fetchzip {
+            src = pkgs.fetchzip {
-            url    = "mirror://apache/spark/"''${pname}-''${version}/''${pname}-''${version}-bin-without-hadoop.tgz";
+              url    = "mirror://apache/spark/"''${pname}-''${version}/''${pname}-''${version}-bin-without-hadoop.tgz";
-            sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
+              sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
-          };
+            };
-        })'';
+          })
+        '';
       };
     };
   };

nixos/modules/services/computing/boinc/client.nix

@@ -27,14 +27,8 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "boinc" {
-        type = types.package;
+        example = "boinc-headless";
-        default = pkgs.boinc;
-        defaultText = literalExpression "pkgs.boinc";
-        example = literalExpression "pkgs.boinc-headless";
-        description = lib.mdDoc ''
-          Which BOINC package to use.
-        '';
       };
 
       dataDir = mkOption {

nixos/modules/services/computing/foldingathome/client.nix

@@ -20,14 +20,7 @@ in
   options.services.foldingathome = {
     enable = mkEnableOption (lib.mdDoc "Folding@home client");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "fahclient" { };
-      type = types.package;
-      default = pkgs.fahclient;
-      defaultText = literalExpression "pkgs.fahclient";
-      description = lib.mdDoc ''
-        Which Folding@home client to use.
-      '';
-    };
 
     user = mkOption {
       type = types.nullOr types.str;

nixos/modules/services/computing/slurm/slurm.nix

@@ -131,14 +131,10 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "slurm" {
-        type = types.package;
+        example = "slurm-full";
+      } // {
         default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; };
-        defaultText = literalExpression "pkgs.slurm";
-        example = literalExpression "pkgs.slurm-full";
-        description = lib.mdDoc ''
-          The package to use for slurm binaries.
-        '';
       };
 
       controlMachine = mkOption {

nixos/modules/services/continuous-integration/buildbot/master.nix

@@ -229,12 +229,8 @@ in {
         description = lib.mdDoc "Specifies port number on which the buildbot HTTP interface listens.";
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "buildbot-full" {
-        type = types.package;
+        example = "buildbot";
-        default = pkgs.buildbot-full;
-        defaultText = literalExpression "pkgs.buildbot-full";
-        description = lib.mdDoc "Package to use for buildbot.";
-        example = literalExpression "pkgs.buildbot";
       };
 
       packages = mkOption {

nixos/modules/services/continuous-integration/buildbot/worker.nix

@@ -128,12 +128,8 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "python3Packages.buildbot-worker" {
-        type = types.package;
+        example = "python2Packages.buildbot-worker";
-        default = pkgs.buildbot-worker;
-        defaultText = literalExpression "pkgs.python3Packages.buildbot-worker";
-        description = lib.mdDoc "Package to use for buildbot worker.";
-        example = literalExpression "pkgs.python2Packages.buildbot-worker";
       };
 
       packages = mkOption {

nixos/modules/services/continuous-integration/github-runner/options.nix

@@ -161,14 +161,7 @@ with lib;
     default = {};
   };
 
-  package = mkOption {
+  package = mkPackageOption pkgs "github-runner" { };
-    type = types.package;
-    description = lib.mdDoc ''
-      Which github-runner derivation to use.
-    '';
-    default = pkgs.github-runner;
-    defaultText = literalExpression "pkgs.github-runner";
-  };
 
   ephemeral = mkOption {
     type = types.bool;

nixos/modules/services/continuous-integration/gitlab-runner.nix

@@ -195,12 +195,8 @@ in {
         Time to wait until a graceful shutdown is turned into a forceful one.
       '';
     };
-    package = mkOption {
+    package = mkPackageOption pkgs "gitlab-runner" {
-      type = types.package;
+      example = "gitlab-runner_1_11";
-      default = pkgs.gitlab-runner;
-      defaultText = literalExpression "pkgs.gitlab-runner";
-      example = literalExpression "pkgs.gitlab-runner_1_11";
-      description = lib.mdDoc "Gitlab Runner package to use.";
     };
     extraPackages = mkOption {
       type = types.listOf types.package;

nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix

@@ -16,7 +16,7 @@ let
     mkRemovedOptionModule
     mkRenamedOptionModule
     types
-
+    mkPackageOption
     ;
 
   cfg = config.services.hercules-ci-agent;
@@ -45,14 +45,7 @@ in
         Support is available at [help@hercules-ci.com](mailto:help@hercules-ci.com).
       '';
     };
-    package = mkOption {
+    package = mkPackageOption pkgs "hercules-ci-agent" { };
-      description = lib.mdDoc ''
-        Package containing the bin/hercules-ci-agent executable.
-      '';
-      type = types.package;
-      default = pkgs.hercules-ci-agent;
-      defaultText = literalExpression "pkgs.hercules-ci-agent";
-    };
     settings = mkOption {
       description = lib.mdDoc ''
         These settings are written to the `agent.toml` file.

nixos/modules/services/continuous-integration/hydra/default.nix

@@ -97,12 +97,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "hydra_unstable" { };
-        type = types.package;
-        default = pkgs.hydra_unstable;
-        defaultText = literalExpression "pkgs.hydra_unstable";
-        description = lib.mdDoc "The Hydra package.";
-      };
 
       hydraURL = mkOption {
         type = types.str;

nixos/modules/services/continuous-integration/jenkins/default.nix

@@ -79,12 +79,7 @@ in {
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "jenkins" { };
-        default = pkgs.jenkins;
-        defaultText = literalExpression "pkgs.jenkins";
-        type = types.package;
-        description = lib.mdDoc "Jenkins package to use.";
-      };
 
       packages = mkOption {
         default = [ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ];

nixos/modules/services/continuous-integration/jenkins/slave.nix

@@ -47,14 +47,7 @@ in {
         '';
       };
 
-      javaPackage = mkOption {
+      javaPackage = mkPackageOption pkgs "jdk" { };
-        default = pkgs.jdk;
-        defaultText = literalExpression "pkgs.jdk";
-        description = lib.mdDoc ''
-          Java package to install.
-        '';
-        type = types.package;
-      };
     };
   };
 

nixos/modules/services/databases/aerospike.nix

@@ -41,12 +41,7 @@ in
     services.aerospike = {
       enable = mkEnableOption (lib.mdDoc "Aerospike server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "aerospike" { };
-        default = pkgs.aerospike;
-        defaultText = literalExpression "pkgs.aerospike";
-        type = types.package;
-        description = lib.mdDoc "Which Aerospike derivation to use";
-      };
 
       workDir = mkOption {
         type = types.str;

nixos/modules/services/databases/cassandra.nix

@@ -11,6 +11,7 @@ let
     recursiveUpdate
     mdDoc
     mkEnableOption
+    mkPackageOption
     mkIf
     mkOption
     types
@@ -155,14 +156,8 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "cassandra" {
-      type = types.package;
+      example = "cassandra_3_11";
-      default = pkgs.cassandra;
-      defaultText = literalExpression "pkgs.cassandra";
-      example = literalExpression "pkgs.cassandra_3_11";
-      description = mdDoc ''
-        The Apache Cassandra package to use.
-      '';
     };
 
     jvmOpts = mkOption {

nixos/modules/services/databases/clickhouse.nix

@@ -13,14 +13,7 @@ with lib;
 
       enable = mkEnableOption (lib.mdDoc "ClickHouse database server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "clickhouse" { };
-        type = types.package;
-        default = pkgs.clickhouse;
-        defaultText = lib.literalExpression "pkgs.clickhouse";
-        description = lib.mdDoc ''
-          ClickHouse package to use.
-        '';
-      };
 
     };
 

nixos/modules/services/databases/cockroachdb.nix

@@ -145,13 +145,8 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "cockroachdb" {
-        type = types.package;
+        extraDescription = ''
-        default = pkgs.cockroachdb;
-        defaultText = literalExpression "pkgs.cockroachdb";
-        description = lib.mdDoc ''
-          The CockroachDB derivation to use for running the service.
-
           This would primarily be useful to enable Enterprise Edition features
           in your own custom CockroachDB build (Nixpkgs CockroachDB binaries
           only contain open source features and open source code).

nixos/modules/services/databases/couchdb.nix

@@ -36,14 +36,7 @@ in {
 
       enable = mkEnableOption (lib.mdDoc "CouchDB Server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "couchdb3" { };
-        type = types.package;
-        default = pkgs.couchdb3;
-        defaultText = literalExpression "pkgs.couchdb3";
-        description = lib.mdDoc ''
-          CouchDB package to use.
-        '';
-      };
 
       adminUser = mkOption {
         type = types.str;

nixos/modules/services/databases/firebird.nix

@@ -42,13 +42,9 @@ in
 
       enable = mkEnableOption (lib.mdDoc "the Firebird super server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "firebird" {
-        default = pkgs.firebird;
+        example = "firebird_3";
-        defaultText = literalExpression "pkgs.firebird";
+        extraDescription = ''
-        type = types.package;
-        example = literalExpression "pkgs.firebird_3";
-        description = lib.mdDoc ''
-          Which Firebird package to be installed: `pkgs.firebird_3`
           For SuperServer use override: `pkgs.firebird_3.override { superServer = true; };`
         '';
       };

nixos/modules/services/databases/hbase-standalone.nix

@@ -46,15 +46,7 @@ in {
         Do not use this configuration for production nor for evaluating HBase performance.
       '');
 
-      package = mkOption {
+      package = mkPackageOption pkgs "hbase" { };
-        type = types.package;
-        default = pkgs.hbase;
-        defaultText = literalExpression "pkgs.hbase";
-        description = lib.mdDoc ''
-          HBase package to use.
-        '';
-      };
-
 
       user = mkOption {
         type = types.str;

nixos/modules/services/databases/influxdb.nix

@@ -116,12 +116,7 @@ in
         type = types.bool;
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "influxdb" { };
-        default = pkgs.influxdb;
-        defaultText = literalExpression "pkgs.influxdb";
-        description = lib.mdDoc "Which influxdb derivation to use";
-        type = types.package;
-      };
 
       user = mkOption {
         default = "influxdb";

nixos/modules/services/databases/influxdb2.nix

@@ -19,6 +19,7 @@ let
     mapAttrsToList
     mdDoc
     mkEnableOption
+    mkPackageOption
     mkIf
     mkOption
     nameValuePair
@@ -278,12 +279,7 @@ in
     services.influxdb2 = {
       enable = mkEnableOption (mdDoc "the influxdb2 server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "influxdb2" { };
-        default = pkgs.influxdb2-server;
-        defaultText = literalExpression "pkgs.influxdb2";
-        description = mdDoc "influxdb2 derivation to use.";
-        type = types.package;
-      };
 
       settings = mkOption {
         default = { };

nixos/modules/services/databases/monetdb.nix

@@ -14,12 +14,7 @@ in {
 
       enable = mkEnableOption (lib.mdDoc "the MonetDB database server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "monetdb" { };
-        type = types.package;
-        default = pkgs.monetdb;
-        defaultText = literalExpression "pkgs.monetdb";
-        description = lib.mdDoc "MonetDB package to use.";
-      };
 
       user = mkOption {
         type = types.str;

nixos/modules/services/databases/mongodb.nix

@@ -31,14 +31,7 @@ in
 
       enable = mkEnableOption (lib.mdDoc "the MongoDB server");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "mongodb" { };
-        default = pkgs.mongodb;
-        defaultText = literalExpression "pkgs.mongodb";
-        type = types.package;
-        description = lib.mdDoc ''
-          Which MongoDB derivation to use.
-        '';
-      };
 
       user = mkOption {
         type = types.str;

nixos/modules/services/databases/neo4j.nix

@@ -174,14 +174,7 @@ in {
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "neo4j" { };
-      type = types.package;
-      default = pkgs.neo4j;
-      defaultText = literalExpression "pkgs.neo4j";
-      description = lib.mdDoc ''
-        Neo4j package to use.
-      '';
-    };
 
     readOnly = mkOption {
       type = types.bool;

nixos/modules/services/databases/openldap.nix

@@ -91,13 +91,8 @@ in {
         description = lib.mdDoc "Whether to enable the ldap server.";
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "openldap" {
-        type = types.package;
+        extraDescription = ''
-        default = pkgs.openldap;
-        defaultText = literalExpression "pkgs.openldap";
-        description = lib.mdDoc ''
-          OpenLDAP package to use.
-
           This can be used to, for example, set an OpenLDAP package
           with custom overrides to enable modules or other
           functionality.

nixos/modules/services/databases/opentsdb.nix

@@ -17,14 +17,7 @@ in {
 
       enable = mkEnableOption (lib.mdDoc "OpenTSDB");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "opentsdb" { };
-        type = types.package;
-        default = pkgs.opentsdb;
-        defaultText = literalExpression "pkgs.opentsdb";
-        description = lib.mdDoc ''
-          OpenTSDB package to use.
-        '';
-      };
 
       user = mkOption {
         type = types.str;

nixos/modules/services/databases/pgbouncer.nix

@@ -82,14 +82,7 @@ in {
 
     enable = mkEnableOption (lib.mdDoc "PostgreSQL connection pooler");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "pgbouncer" { };
-      type = types.package;
-      default = pkgs.pgbouncer;
-      defaultText = literalExpression "pkgs.pgbouncer";
-      description = lib.mdDoc ''
-        The pgbouncer package to use.
-      '';
-    };
 
     openFirewall = mkOption {
       type = types.bool;

nixos/modules/services/databases/pgmanage.nix

@@ -46,14 +46,7 @@ in {
   options.services.pgmanage = {
     enable = mkEnableOption (lib.mdDoc "PostgreSQL Administration for the web");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "pgmanage" { };
-      type = types.package;
-      default = pkgs.pgmanage;
-      defaultText = literalExpression "pkgs.pgmanage";
-      description = lib.mdDoc ''
-        The pgmanage package to use.
-      '';
-    };
 
     connections = mkOption {
       type = types.attrsOf types.str;

nixos/modules/services/databases/postgresql.nix

@@ -53,12 +53,8 @@ in
 
       enableJIT = mkEnableOption (lib.mdDoc "JIT support");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "postgresql" {
-        type = types.package;
+        example = "postgresql_15";
-        example = literalExpression "pkgs.postgresql_15";
-        description = lib.mdDoc ''
-          PostgreSQL package to use.
-        '';
       };
 
       port = mkOption {

nixos/modules/services/databases/redis.nix

@@ -54,12 +54,7 @@ in {
   options = {
 
     services.redis = {
-      package = mkOption {
+      package = mkPackageOption pkgs "redis" { };
-        type = types.package;
-        default = pkgs.redis;
-        defaultText = literalExpression "pkgs.redis";
-        description = lib.mdDoc "Which Redis derivation to use.";
-      };
 
       vmOverCommit = mkEnableOption (lib.mdDoc ''
         setting of vm.overcommit_memory to 1

nixos/modules/services/databases/surrealdb.nix

@@ -10,14 +10,7 @@ in {
     services.surrealdb = {
       enable = mkEnableOption (lib.mdDoc "SurrealDB, a scalable, distributed, collaborative, document-graph database, for the realtime web");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "surrealdb" { };
-        default = pkgs.surrealdb;
-        defaultText = literalExpression "pkgs.surrealdb";
-        type = types.package;
-        description = lib.mdDoc ''
-          Which surrealdb derivation to use.
-        '';
-      };
 
       dbPath = mkOption {
         type = types.str;

nixos/modules/services/databases/victoriametrics.nix

@@ -3,14 +3,7 @@ let cfg = config.services.victoriametrics; in
 {
   options.services.victoriametrics = with lib; {
     enable = mkEnableOption (lib.mdDoc "victoriametrics");
-    package = mkOption {
+    package = mkPackageOption pkgs "victoriametrics" { };
-      type = types.package;
-      default = pkgs.victoriametrics;
-      defaultText = literalExpression "pkgs.victoriametrics";
-      description = lib.mdDoc ''
-        The VictoriaMetrics distribution to use.
-      '';
-    };
     listenAddress = mkOption {
       default = ":8428";
       type = types.str;

nixos/modules/services/desktops/gvfs.nix

@@ -32,12 +32,7 @@ in
       enable = mkEnableOption (lib.mdDoc "GVfs, a userspace virtual filesystem");
 
       # gvfs can be built with multiple configurations
-      package = mkOption {
+      package = mkPackageOption pkgs [ "gnome" "gvfs" ] { };
-        type = types.package;
-        default = pkgs.gnome.gvfs;
-        defaultText = literalExpression "pkgs.gnome.gvfs";
-        description = lib.mdDoc "Which GVfs package to use.";
-      };
 
     };
 

nixos/modules/services/desktops/pipewire/pipewire.nix

@@ -25,14 +25,7 @@ in {
     services.pipewire = {
       enable = mkEnableOption (lib.mdDoc "pipewire service");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "pipewire" { };
-        type = types.package;
-        default = pkgs.pipewire;
-        defaultText = literalExpression "pkgs.pipewire";
-        description = lib.mdDoc ''
-          The pipewire derivation to use.
-        '';
-      };
 
       socketActivation = mkOption {
         default = true;

nixos/modules/services/development/distccd.nix

@@ -66,14 +66,7 @@ in
         '';
       };
 
-      package = mkOption {
+      package = mkPackageOption pkgs "distcc" { };
-        type = types.package;
-        default = pkgs.distcc;
-        defaultText = literalExpression "pkgs.distcc";
-        description = lib.mdDoc ''
-          The distcc package to use.
-        '';
-      };
 
       port = mkOption {
         type = types.port;

nixos/modules/services/development/jupyter/default.nix

@@ -34,17 +34,10 @@ in {
       '';
     };
 
-    package = mkOption {
+    # NOTE: We don't use top-level jupyter because we don't
-      type = types.package;
+    # want to pass in JUPYTER_PATH but use .environment instead,
-      # NOTE: We don't use top-level jupyter because we don't
+    # saving a rebuild.
-      # want to pass in JUPYTER_PATH but use .environment instead,
+    package = mkPackageOption pkgs [ "python3" "pkgs" "notebook" ] { };
-      # saving a rebuild.
-      default = pkgs.python3.pkgs.notebook;
-      defaultText = literalExpression "pkgs.python3.pkgs.notebook";
-      description = lib.mdDoc ''
-        Jupyter package to use.
-      '';
-    };
 
     command = mkOption {
       type = types.str;

nixos/modules/services/development/rstudio-server/default.nix

@@ -39,14 +39,8 @@ in
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "rstudio-server" {
-      type = types.package;
+      example = "rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }";
-      default = pkgs.rstudio-server;
-      defaultText = literalExpression "pkgs.rstudio-server";
-      example = literalExpression "pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }";
-      description = lib.mdDoc ''
-        Rstudio server package to use. Can be set to rstudioServerWrapper to provide packages.
-      '';
     };
 
     rserverExtraConfig = mkOption {

nixos/modules/services/development/zammad.nix

@@ -30,12 +30,7 @@ in
     services.zammad = {
       enable = mkEnableOption (lib.mdDoc "Zammad, a web-based, open source user support/ticketing solution");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "zammad" { };
-        type = types.package;
-        default = pkgs.zammad;
-        defaultText = literalExpression "pkgs.zammad";
-        description = lib.mdDoc "Zammad package to use.";
-      };
 
       dataDir = mkOption {
         type = types.path;

nixos/modules/services/display-managers/greetd.nix

@@ -10,12 +10,7 @@ in
   options.services.greetd = {
     enable = mkEnableOption (lib.mdDoc "greetd");
 
-    package = mkOption {
+    package = mkPackageOption pkgs [ "greetd" "greetd" ] { };
-      type = types.package;
-      default = pkgs.greetd.greetd;
-      defaultText = literalExpression "pkgs.greetd.greetd";
-      description = lib.mdDoc "The greetd package that should be used.";
-    };
 
     settings = mkOption {
       type = settingsFormat.type;

nixos/modules/services/editors/emacs.nix

@@ -63,14 +63,7 @@ in
     };
 
 
-    package = mkOption {
+    package = mkPackageOption pkgs "emacs" { };
-      type = types.package;
-      default = pkgs.emacs;
-      defaultText = literalExpression "pkgs.emacs";
-      description = lib.mdDoc ''
-        emacs derivation to use.
-      '';
-    };
 
     defaultEditor = mkOption {
       type = types.bool;

nixos/modules/services/editors/infinoted.nix

@@ -8,14 +8,7 @@ in {
   options.services.infinoted = {
     enable = mkEnableOption (lib.mdDoc "infinoted");
 
-    package = mkOption {
+    package = mkPackageOption pkgs "libinfinity" { };
-      type = types.package;
-      default = pkgs.libinfinity;
-      defaultText = literalExpression "pkgs.libinfinity";
-      description = lib.mdDoc ''
-        Package providing infinoted
-      '';
-    };
 
     keyFile = mkOption {
       type = types.nullOr types.path;

nixos/modules/services/finance/odoo.nix

@@ -11,12 +11,7 @@ in
     services.odoo = {
       enable = mkEnableOption (lib.mdDoc "odoo");
 
-      package = mkOption {
+      package = mkPackageOption pkgs "odoo" { };
-        type = types.package;
-        default = pkgs.odoo;
-        defaultText = literalExpression "pkgs.odoo";
-        description = lib.mdDoc "Odoo package to use.";
-      };
 
       addons = mkOption {
         type = with types; listOf package;

nixos/modules/services/games/asf.nix

@@ -47,12 +47,12 @@ in
             description = lib.mdDoc "Whether to start the web-ui. This is the preferred way of configuring things such as the steam guard token.";
           };
 
-          package = mkOption {
+          package = mkPackageOption pkgs [ "ArchiSteamFarm" "ui" ] {
-            type = types.package;
+            extraDescription = ''
-            default = pkgs.ArchiSteamFarm.ui;
+              ::: {.note}
-            defaultText = lib.literalExpression "pkgs.ArchiSteamFarm.ui";
+              Contents must be in lib/dist
-            description =
+              :::
-              lib.mdDoc "Web-UI package to use. Contents must be in lib/dist.";
+            '';
           };
         };
       };
@@ -65,12 +65,13 @@ in
       description = lib.mdDoc "The Web-UI hosted on 127.0.0.1:1242.";
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "ArchiSteamFarm" {
-      type = types.package;
+      extraDescription = ''
-      default = pkgs.ArchiSteamFarm;
+        ::: {.warning}
-      defaultText = lib.literalExpression "pkgs.ArchiSteamFarm";
+        Should always be the latest version, for security reasons,
-      description =
+        since this module uses very new features and to not get out of sync with the Steam API.
-        lib.mdDoc "Package to use. Should always be the latest version, for security reasons, since this module uses very new features and to not get out of sync with the Steam API.";
+        :::
+      '';
     };
 
     dataDir = mkOption {

nixos/modules/services/games/crossfire-server.nix

@@ -15,13 +15,11 @@ in {
       '';
     };
 
-    package = mkOption {
+    package = mkPackageOption pkgs "crossfire-server" {
-      type = types.package;
+      extraDescription = ''
-      default = pkgs.crossfire-server;
+        ::: {.note}
-      defaultText = literalExpression "pkgs.crossfire-server";
+        This will also be used for map/arch data, if you don't change {option}`dataDir`
-      description = lib.mdDoc ''
+        :::
-        The package to use for the Crossfire server (and map/arch data, if you
-        don't change dataDir).
       '';
     };