nixos/*: fix docbook deprecation notices

mostly no rendering changes except in buildkite, which used markdown
where docbook was expected without marking up its markdown.

pennae d9832283 767485a0

Changed files
+73 -75
nixos
modules
programs
services
continuous-integration
desktops
misc
sourcehut
monitoring
prometheus
networking
web-apps
system
virtualisation
+1 -1
nixos/modules/programs/rust-motd.nix
···
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;
+1 -1
nixos/modules/services/continuous-integration/buildkite-agents.nix
···
inherit name;
value = mkOption {
default = null;
-
inherit description;
+
description = lib.mdDoc description;
type = types.nullOr types.lines;
} // (if example == null then {} else { inherit example; });
};
+1 -1
nixos/modules/services/desktops/espanso.nix
···
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 {
+1 -1
nixos/modules/services/misc/sourcehut/default.nix
···
todosrht
]);
mkOptionNullOrStr = description: mkOption {
-
inherit description;
+
description = lib.mdDoc description;
type = with types; nullOr str;
default = null;
};
+1 -1
nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix
···
};
"${field}" = lib.mkOption {
type = int;
-
inherit description;
+
description = lib.mdDoc description;
};
location = lib.mkOption {
type = str;
+1 -1
nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix
···
v2rayEndpoint = mkOption {
type = types.str;
default = "127.0.0.1:54321";
-
description = ''
+
description = lib.mdDoc ''
v2ray grpc api endpoint
'';
};
+3 -3
nixos/modules/services/networking/i2pd.nix
···
};
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.
'';
};
+4 -4
nixos/modules/services/networking/keepalived/default.nix
···
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.
'';
};
+1 -1
nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
···
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;
+4 -4
nixos/modules/services/networking/wpa_supplicant.nix
···
};
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`.
'';
};
+21 -21
nixos/modules/services/web-apps/dolibarr.nix
···
{
# 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.
'';
};
···
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.
'';
};
···
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.";
};
};
+28 -28
nixos/modules/services/web-apps/writefreely.nix
···
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.
'';
···
theme = mkOption {
type = types.str;
default = "write";
-
description = "The theme to apply.";
+
description = lib.mdDoc "The theme to apply.";
};
};
···
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.";
};
};
};
···
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.
'';
};
};
···
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";
···
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.";
};
};
···
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.";
};
};
};
+5 -7
nixos/modules/system/boot/networkd.nix
···
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.
'';
};
};
···
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.
'';
};
+1 -1
nixos/modules/virtualisation/qemu-vm.nix
···
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.
'';