diff options
author | pennae <github@quasiparticle.net> | 2022-09-01 19:44:36 +0200 |
---|---|---|
committer | pennae <82953136+pennae@users.noreply.github.com> | 2022-09-10 18:23:13 +0200 |
commit | d98322834b496876723a529b92c2f80eeae0a60c (patch) | |
tree | 2930b7421a2384f27ab70a2fef3175def1d5aaf8 /nixos | |
parent | 767485a0dee24329e2b34cd4af0c08ea21e959ea (diff) | |
download | nixlib-d98322834b496876723a529b92c2f80eeae0a60c.tar nixlib-d98322834b496876723a529b92c2f80eeae0a60c.tar.gz nixlib-d98322834b496876723a529b92c2f80eeae0a60c.tar.bz2 nixlib-d98322834b496876723a529b92c2f80eeae0a60c.tar.lz nixlib-d98322834b496876723a529b92c2f80eeae0a60c.tar.xz nixlib-d98322834b496876723a529b92c2f80eeae0a60c.tar.zst nixlib-d98322834b496876723a529b92c2f80eeae0a60c.zip |
nixos/*: fix docbook deprecation notices
mostly no rendering changes except in buildkite, which used markdown where docbook was expected without marking up its markdown.
Diffstat (limited to 'nixos')
14 files changed, 73 insertions, 75 deletions
diff --git a/nixos/modules/programs/rust-motd.nix b/nixos/modules/programs/rust-motd.nix index 671e701cd195..f89b5e038387 100644 --- a/nixos/modules/programs/rust-motd.nix +++ b/nixos/modules/programs/rust-motd.nix @@ -7,7 +7,7 @@ let format = pkgs.formats.toml { }; in { options.programs.rust-motd = { - enable = mkEnableOption "rust-motd"; + enable = mkEnableOption (lib.mdDoc "rust-motd"); enableMotdInSSHD = mkOption { default = true; type = types.bool; diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index 3d29a641a195..7c8f77580ff6 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -9,7 +9,7 @@ let inherit name; value = mkOption { default = null; - inherit description; + description = lib.mdDoc description; type = types.nullOr types.lines; } // (if example == null then {} else { inherit example; }); }; diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix index 4ef6724dda0a..cbc48034795e 100644 --- a/nixos/modules/services/desktops/espanso.nix +++ b/nixos/modules/services/desktops/espanso.nix @@ -6,7 +6,7 @@ in { meta = { maintainers = with lib.maintainers; [ numkem ]; }; options = { - services.espanso = { enable = options.mkEnableOption "Espanso"; }; + services.espanso = { enable = options.mkEnableOption (lib.mdDoc "Espanso"); }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index dd0e016a1da7..9177f3cd022e 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -101,7 +101,7 @@ let todosrht ]); mkOptionNullOrStr = description: mkOption { - inherit description; + description = lib.mdDoc description; type = with types; nullOr str; default = null; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 42bf1788aea9..1f7235cb7830 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -16,7 +16,7 @@ in }; "${field}" = lib.mkOption { type = int; - inherit description; + description = lib.mdDoc description; }; location = lib.mkOption { type = str; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix b/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix index 185506cfc2b7..a019157c664b 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix @@ -11,7 +11,7 @@ in v2rayEndpoint = mkOption { type = types.str; default = "127.0.0.1:54321"; - description = '' + description = lib.mdDoc '' v2ray grpc api endpoint ''; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 47f4a42aa5dd..b60cbe664b6f 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -396,12 +396,12 @@ in }; precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // { - description = '' + description = lib.mdDoc '' Whenever to use precomputated tables for ElGamal. - <command>i2pd</command> defaults to <literal>false</literal> + {command}`i2pd` defaults to `false` to save 64M of memory (and looses some performance). - We default to <literal>true</literal> as that is what most + We default to `true` as that is what most users want anyway. ''; }; diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 1ab25c879916..e9df08f00c37 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -268,11 +268,11 @@ in type = types.nullOr types.path; default = null; example = "/run/keys/keepalived.env"; - description = '' + description = lib.mdDoc '' Environment variables from this file will be interpolated into the - final config file using envsubst with this syntax: <literal>$ENVIRONMENT</literal> - or <literal>''${VARIABLE}</literal>. - The file should contain lines formatted as <literal>SECRET_VAR=SECRET_VALUE</literal>. + final config file using envsubst with this syntax: `$ENVIRONMENT` + or `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. This is useful to avoid putting secrets into the nix store. ''; }; diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 8245b25719e4..dc6d8f48e626 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -152,7 +152,7 @@ rec { option = mkOption { type = types.attrsOf (types.submodule {options = paramsToOptions params;}); default = {}; - inherit description; + description = lib.mdDoc description; }; render = postfix: attrs: let postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 6c58bcfbbf18..119575bdddb4 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -187,12 +187,12 @@ in { }; allowAuxiliaryImperativeNetworks = mkEnableOption (lib.mdDoc "support for imperative & declarative networks") // { - description = '' + description = lib.mdDoc '' Whether to allow configuring networks "imperatively" (e.g. via - <literal>wpa_supplicant_gui</literal>) and declaratively via - <xref linkend="opt-networking.wireless.networks"/>. + `wpa_supplicant_gui`) and declaratively via + [](#opt-networking.wireless.networks). - Please note that this adds a custom patch to <literal>wpa_supplicant</literal>. + Please note that this adds a custom patch to `wpa_supplicant`. ''; }; diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix index 2b2e2a6214dc..5335c439329c 100644 --- a/nixos/modules/services/web-apps/dolibarr.nix +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -48,12 +48,12 @@ in { # interface options.services.dolibarr = { - enable = mkEnableOption "dolibarr"; + enable = mkEnableOption (lib.mdDoc "dolibarr"); domain = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Domain name of your server. ''; }; @@ -61,35 +61,35 @@ in user = mkOption { type = types.str; default = "dolibarr"; - description = '' + description = lib.mdDoc '' User account under which dolibarr runs. - <note><para> - If left as the default value this user will automatically be created - on system activation, otherwise you are responsible for - ensuring the user exists before the dolibarr application starts. - </para></note> + ::: {.note} + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the dolibarr application starts. + ::: ''; }; group = mkOption { type = types.str; default = "dolibarr"; - description = '' + description = lib.mdDoc '' Group account under which dolibarr runs. - <note><para> - If left as the default value this group will automatically be created - on system activation, otherwise you are responsible for - ensuring the group exists before the dolibarr application starts. - </para></note> + ::: {.note} + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the group exists before the dolibarr application starts. + ::: ''; }; stateDir = mkOption { type = types.str; default = "/var/lib/dolibarr"; - description = '' + description = lib.mdDoc '' State and configuration directory dolibarr will use. ''; }; @@ -98,33 +98,33 @@ in host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.port; default = 3306; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "dolibarr"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "dolibarr"; - description = "Database username."; + description = lib.mdDoc "Database username."; }; passwordFile = mkOption { type = with types; nullOr path; default = null; example = "/run/keys/dolibarr-dbpassword"; - description = "Database password file."; + description = lib.mdDoc "Database password file."; }; createLocally = mkOption { type = types.bool; default = true; - description = "Create the database and database user locally."; + description = lib.mdDoc "Create the database and database user locally."; }; }; diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix index c363760d5c2d..dec00b46f335 100644 --- a/nixos/modules/services/web-apps/writefreely.nix +++ b/nixos/modules/services/web-apps/writefreely.nix @@ -133,45 +133,45 @@ let in { options.services.writefreely = { enable = - lib.mkEnableOption "Writefreely, build a digital writing community"; + lib.mkEnableOption (lib.mdDoc "Writefreely, build a digital writing community"); package = lib.mkOption { type = lib.types.package; default = pkgs.writefreely; defaultText = lib.literalExpression "pkgs.writefreely"; - description = "Writefreely package to use."; + description = lib.mdDoc "Writefreely package to use."; }; stateDir = mkOption { type = types.path; default = "/var/lib/writefreely"; - description = "The state directory where keys and data are stored."; + description = lib.mdDoc "The state directory where keys and data are stored."; }; user = mkOption { type = types.str; default = "writefreely"; - description = "User under which Writefreely is ran."; + description = lib.mdDoc "User under which Writefreely is ran."; }; group = mkOption { type = types.str; default = "writefreely"; - description = "Group under which Writefreely is ran."; + description = lib.mdDoc "Group under which Writefreely is ran."; }; host = mkOption { type = types.str; default = ""; - description = "The public host name to serve."; + description = lib.mdDoc "The public host name to serve."; example = "example.com"; }; settings = mkOption { default = { }; - description = '' - Writefreely configuration (<filename>config.ini</filename>). Refer to - <link xlink:href="https://writefreely.org/docs/latest/admin/config" /> + description = lib.mdDoc '' + Writefreely configuration ({file}`config.ini`). Refer to + <https://writefreely.org/docs/latest/admin/config> for details. ''; @@ -183,7 +183,7 @@ in { theme = mkOption { type = types.str; default = "write"; - description = "The theme to apply."; + description = lib.mdDoc "The theme to apply."; }; }; @@ -192,7 +192,7 @@ in { type = types.port; default = if cfg.nginx.enable then 18080 else 80; defaultText = "80"; - description = "The port WriteFreely should listen on."; + description = lib.mdDoc "The port WriteFreely should listen on."; }; }; }; @@ -203,60 +203,60 @@ in { type = mkOption { type = types.enum [ "sqlite3" "mysql" ]; default = "sqlite3"; - description = "The database provider to use."; + description = lib.mdDoc "The database provider to use."; }; name = mkOption { type = types.str; default = "writefreely"; - description = "The name of the database to store data in."; + description = lib.mdDoc "The name of the database to store data in."; }; user = mkOption { type = types.nullOr types.str; default = if cfg.database.type == "mysql" then "writefreely" else null; defaultText = "writefreely"; - description = "The database user to connect as."; + description = lib.mdDoc "The database user to connect as."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = "The file to load the database password from."; + description = lib.mdDoc "The file to load the database password from."; }; host = mkOption { type = types.str; default = "localhost"; - description = "The database host to connect to."; + description = lib.mdDoc "The database host to connect to."; }; port = mkOption { type = types.port; default = 3306; - description = "The port used when connecting to the database host."; + description = lib.mdDoc "The port used when connecting to the database host."; }; tls = mkOption { type = types.bool; default = false; description = - "Whether or not TLS should be used for the database connection."; + lib.mdDoc "Whether or not TLS should be used for the database connection."; }; migrate = mkOption { type = types.bool; default = true; description = - "Whether or not to automatically run migrations on startup."; + lib.mdDoc "Whether or not to automatically run migrations on startup."; }; createLocally = mkOption { type = types.bool; default = false; - description = '' - When <option>services.writefreely.database.type</option> is set to - <code>"mysql"</code>, this option will enable the MySQL service locally. + description = lib.mdDoc '' + When {option}`services.writefreely.database.type` is set to + `"mysql"`, this option will enable the MySQL service locally. ''; }; }; @@ -264,15 +264,15 @@ in { admin = { name = mkOption { type = types.nullOr types.str; - description = "The name of the first admin user."; + description = lib.mdDoc "The name of the first admin user."; default = null; }; initialPasswordFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a file containing the initial password for the admin user. - If not provided, the default password will be set to <code>nixos</code>. + If not provided, the default password will be set to `nixos`. ''; default = pkgs.writeText "default-admin-pass" "nixos"; defaultText = "/nix/store/xxx-default-admin-pass"; @@ -284,13 +284,13 @@ in { type = types.bool; default = false; description = - "Whether or not to enable and configure nginx as a proxy for WriteFreely."; + lib.mdDoc "Whether or not to enable and configure nginx as a proxy for WriteFreely."; }; forceSSL = mkOption { type = types.bool; default = false; - description = "Whether or not to force the use of SSL."; + description = lib.mdDoc "Whether or not to force the use of SSL."; }; }; @@ -299,7 +299,7 @@ in { type = types.bool; default = false; description = - "Whether or not to automatically fetch and configure SSL certs."; + lib.mdDoc "Whether or not to automatically fetch and configure SSL certs."; }; }; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 25e30c9303bd..cb60117f0eb8 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1257,11 +1257,10 @@ let default = {}; example = { Route = "fd00::/64"; }; type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6RoutePrefix; - description = '' + description = lib.mdDoc '' Each attribute in this set specifies an option in the - <literal>[IPv6RoutePrefix]</literal> section of the unit. See - <citerefentry><refentrytitle>systemd.network</refentrytitle> - <manvolnum>5</manvolnum></citerefentry> for details. + `[IPv6RoutePrefix]` section of the unit. See + {manpage}`systemd.network(5)` for details. ''; }; }; @@ -1413,10 +1412,9 @@ let default = []; example = [ { ipv6RoutePrefixConfig = { Route = "fd00::/64"; LifetimeSec = 3600; }; } ]; type = with types; listOf (submodule ipv6RoutePrefixOptions); - description = '' + description = lib.mdDoc '' A list of ipv6RoutePrefix sections to be added to the unit. See - <citerefentry><refentrytitle>systemd.network</refentrytitle> - <manvolnum>5</manvolnum></citerefentry> for details. + {manpage}`systemd.network(5)` for details. ''; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0207bfba82ad..edc6dfdc15ae 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -584,7 +584,7 @@ in example = literalExpression '' import pkgs.path { system = "x86_64-darwin"; } ''; - description = '' + description = lib.mdDoc '' pkgs set to use for the host-specific packages of the vm runner. Changing this to e.g. a Darwin package set allows running NixOS VMs on Darwin. ''; |