treewide: Format all Nix files

Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
This commit is contained in:
Silvan Mosberger
2025-04-01 20:10:43 +02:00
parent 2140bf39e4
commit 374e6bcc40
1523 changed files with 986047 additions and 513621 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,7 @@ with lib;
options = {
basicAuth = mkOption {
type = types.attrsOf types.str;
default = {};
default = { };
example = literalExpression ''
{
user = "password";
@@ -100,7 +100,12 @@ with lib;
};
return = mkOption {
type = with types; nullOr (oneOf [ str int ]);
type =
with types;
nullOr (oneOf [
str
int
]);
default = null;
example = "301 http://example.com$request_uri";
description = ''
@@ -110,7 +115,7 @@ with lib;
fastcgiParams = mkOption {
type = types.attrsOf (types.either types.str types.path);
default = {};
default = { };
description = ''
FastCGI parameters to override. Unlike in the Nginx
configuration file, overriding only some default parameters

View File

@@ -19,50 +19,65 @@ with lib;
serverAliases = mkOption {
type = types.listOf types.str;
default = [];
example = [ "www.example.org" "example.org" ];
default = [ ];
example = [
"www.example.org"
"example.org"
];
description = ''
Additional names of virtual hosts served by this virtual host configuration.
'';
};
listen = mkOption {
type = with types; listOf (submodule {
options = {
addr = mkOption {
type = str;
description = "Listen address.";
type =
with types;
listOf (submodule {
options = {
addr = mkOption {
type = str;
description = "Listen address.";
};
port = mkOption {
type = types.nullOr port;
description = ''
Port number to listen on.
If unset and the listen address is not a socket then nginx defaults to 80.
'';
default = null;
};
ssl = mkOption {
type = bool;
description = "Enable SSL.";
default = false;
};
proxyProtocol = mkOption {
type = bool;
description = "Enable PROXY protocol.";
default = false;
};
extraParameters = mkOption {
type = listOf str;
description = "Extra parameters of this listen directive.";
default = [ ];
example = [
"backlog=1024"
"deferred"
];
};
};
port = mkOption {
type = types.nullOr port;
description = ''
Port number to listen on.
If unset and the listen address is not a socket then nginx defaults to 80.
'';
default = null;
};
ssl = mkOption {
type = bool;
description = "Enable SSL.";
default = false;
};
proxyProtocol = mkOption {
type = bool;
description = "Enable PROXY protocol.";
default = false;
};
extraParameters = mkOption {
type = listOf str;
description = "Extra parameters of this listen directive.";
default = [ ];
example = [ "backlog=1024" "deferred" ];
};
};
});
default = [];
});
default = [ ];
example = [
{ addr = "195.154.1.1"; port = 443; ssl = true; }
{ addr = "192.154.1.1"; port = 80; }
{
addr = "195.154.1.1";
port = 443;
ssl = true;
}
{
addr = "192.154.1.1";
port = 80;
}
{ addr = "unix:/var/run/nginx.sock"; }
];
description = ''
@@ -86,8 +101,11 @@ with lib;
Note: This option overrides `enableIPv6`
'';
default = [];
example = [ "127.0.0.1" "[::1]" ];
default = [ ];
example = [
"127.0.0.1"
"[::1]"
];
};
enableACME = mkOption {
@@ -326,7 +344,7 @@ with lib;
basicAuth = mkOption {
type = types.attrsOf types.str;
default = {};
default = { };
example = literalExpression ''
{
user = "password";
@@ -350,10 +368,14 @@ with lib;
};
locations = mkOption {
type = types.attrsOf (types.submodule (import ./location-options.nix {
inherit lib config;
}));
default = {};
type = types.attrsOf (
types.submodule (
import ./location-options.nix {
inherit lib config;
}
)
);
default = { };
example = literalExpression ''
{
"/" = {