diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-30 02:49:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 02:49:30 +0100 |
| commit | feeae486deb50aab190d1dd46626a6c5f9f3f698 (patch) | |
| tree | 3d818b400b9a6d5654629023fa2f2380e2f3aa08 /nixos/modules/services/matrix | |
| parent | babc0d5e96871971a5d9cf4c4a2a68edba413dc4 (diff) | |
| parent | 0a37316d6cfea44280f4470b6867a711a24606bd (diff) | |
| download | nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.tar nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.tar.gz nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.tar.bz2 nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.tar.lz nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.tar.xz nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.tar.zst nixlib-feeae486deb50aab190d1dd46626a6c5f9f3f698.zip | |
Merge pull request #261702 from h7x4/replace-mkoption-with-mkpackageoption
treewide: use `mkPackageOption`
Diffstat (limited to 'nixos/modules/services/matrix')
| -rw-r--r-- | nixos/modules/services/matrix/appservice-discord.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/services/matrix/conduit.nix | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 6ce8718c35d8..c2c3abb79f97 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -15,14 +15,7 @@ in { services.matrix-appservice-discord = { enable = mkEnableOption (lib.mdDoc "a bridge between Matrix and Discord"); - package = mkOption { - type = types.package; - default = pkgs.matrix-appservice-discord; - defaultText = literalExpression "pkgs.matrix-appservice-discord"; - description = lib.mdDoc '' - Which package of matrix-appservice-discord to use. - ''; - }; + package = mkPackageOption pkgs "matrix-appservice-discord" { }; settings = mkOption rec { # TODO: switch to types.config.json as prescribed by RFC42 once it's implemented diff --git a/nixos/modules/services/matrix/conduit.nix b/nixos/modules/services/matrix/conduit.nix index 76af7ba22857..b0fc85dbda7b 100644 --- a/nixos/modules/services/matrix/conduit.nix +++ b/nixos/modules/services/matrix/conduit.nix @@ -20,14 +20,7 @@ in example = { RUST_BACKTRACE="yes"; }; }; - package = mkOption { - type = types.package; - default = pkgs.matrix-conduit; - defaultText = lib.literalExpression "pkgs.matrix-conduit"; - description = lib.mdDoc '' - Package of the conduit matrix server to use. - ''; - }; + package = mkPackageOption pkgs "matrix-conduit" { }; settings = mkOption { type = types.submodule { |