movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-09-01 18:01:28 +00:00 • committed by GitHub
commit dbe312bfdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
957 changed files with 3298 additions and 3480 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/tests/common/acme/server/default.nix
View file

@ -81,8 +81,8 @@ in {
type = types.str;
readOnly = true;
default = domain;
description = ''
A domain name to use with the <literal>nodes</literal> attribute to
description = lib.mdDoc ''
A domain name to use with the `nodes` attribute to
identify the CA server.
'';
};
@ -90,10 +90,10 @@ in {
type = types.path;
readOnly = true;
default = testCerts.ca.cert;
description = ''
A certificate file to use with the <literal>nodes</literal> attribute to
description = lib.mdDoc ''
A certificate file to use with the `nodes` attribute to
inject the test CA certificate used in the ACME server into
<option>security.pki.certificateFiles</option>.
{option}`security.pki.certificateFiles`.
'';
};
};

6
nixos/tests/common/auto.nix
View file

@ -19,17 +19,17 @@ in
enable = mkOption {
default = false;
description = ''
description = lib.mdDoc ''
Whether to enable the fake "auto" display manager, which
automatically logs in the user specified in the
<option>user</option> option. This is mostly useful for
{option}`user` option. This is mostly useful for
automated tests.
'';
};
user = mkOption {
default = "root";
description = "The user account to login automatically.";
description = lib.mdDoc "The user account to login automatically.";
};
};

6
nixos/tests/common/resolver.nix
View file

@ -10,15 +10,15 @@
type = lib.types.bool;
default = true;
internal = true;
description = ''
description = lib.mdDoc ''
Whether to enable the resolver that automatically discovers zone in the
test network.
This option is <literal>true</literal> by default, because the module
This option is `true` by default, because the module
defining this option needs to be explicitly imported.
The reason this option exists is for the
<filename>nixos/tests/common/acme/server</filename> module, which
{file}`nixos/tests/common/acme/server` module, which
needs that option to disable the resolver once the user has set its own
resolver.
'';

2
nixos/tests/systemd-confinement.nix
View file

@ -153,7 +153,7 @@ import ./make-test-python.nix {
options.__testSteps = lib.mkOption {
type = lib.types.lines;
description = "All of the test steps combined as a single script.";
description = lib.mdDoc "All of the test steps combined as a single script.";
};
config.environment.systemPackages = lib.singleton testClient;