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

treewide: Fix incorrect string indentations

Browse source 
(cherry picked from commit dd7d5339f7)
This commit is contained in:
piegames 2024-12-23 21:59:12 +01:00
parent 772006e8c0
commit f6ea57fd16
17 changed files with 69 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/generators.nix
View file

@ -597,7 +597,9 @@ in rec {
(expr "\t${ind}" value)
]) x));
in ''<?xml version="1.0" encoding="UTF-8"?>
in
''
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
${expr "" v}

4
lib/lists.nix
View file

@ -1748,8 +1748,8 @@ rec {
```
:::
*/
crossLists = warn
''lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
crossLists = warn ''
lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
For example, the following function call:

3
nixos/modules/hardware/wooting.nix
View file

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
{
options.hardware.wooting.enable = lib.mkEnableOption ''support for Wooting keyboards.
options.hardware.wooting.enable = lib.mkEnableOption ''
support for Wooting keyboards.
Note that users must be in the "input" group for udev rules to apply'';
config = lib.mkIf config.hardware.wooting.enable {

4
nixos/modules/services/backup/borgbackup.nix
View file

@ -95,7 +95,7 @@ let
path = [
config.services.borgbackup.package pkgs.openssh
];
script = "exec " + lib.optionalString cfg.inhibitsSleep ''\
script = "exec " + lib.optionalString cfg.inhibitsSleep ''
${pkgs.systemd}/bin/systemd-inhibit \
--who="borgbackup" \
--what="sleep" \
@ -173,7 +173,7 @@ let
mode != "none" -> passCommand != null || passphrase != null;
message =
"passCommand or passphrase has to be specified because"
+ '' borgbackup.jobs.${name}.encryption != "none"'';
+ " borgbackup.jobs.${name}.encryption != \"none\"";
};
mkRepoService = name: cfg:

3
nixos/modules/services/cluster/kubernetes/apiserver.nix
View file

@ -323,7 +323,8 @@ in
after = [ "network.target" ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-apiserver \
ExecStart = ''
${top.package}/bin/kube-apiserver \
--allow-privileged=${boolToString cfg.allowPrivileged} \
--authorization-mode=${concatStringsSep "," cfg.authorizationMode} \
${optionalString (elem "ABAC" cfg.authorizationMode)

3
nixos/modules/services/cluster/kubernetes/proxy.nix
View file

@ -65,7 +65,8 @@ in
path = with pkgs; [ iptables conntrack-tools ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-proxy \
ExecStart = ''
${top.package}/bin/kube-proxy \
--bind-address=${cfg.bindAddress} \
${optionalString (top.clusterCidr!=null)
"--cluster-cidr=${top.clusterCidr}"} \

3
nixos/modules/services/databases/redis.nix
View file

@ -214,7 +214,8 @@ in {
masterAuth = mkOption {
type = with types; nullOr str;
default = null;
description = ''If the master is password protected (using the requirePass configuration)
description = ''
If the master is password protected (using the requirePass configuration)
it is possible to tell the slave to authenticate before starting the replication synchronization
process, otherwise the master will refuse the slave request.
(STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)'';

12
nixos/modules/services/desktops/pipewire/wireplumber.nix
View file

@ -61,7 +61,8 @@ in
# in sections.
type = attrsOf (attrsOf json.type);
default = { };
example = literalExpression ''{
example = literalExpression ''
{
"log-level-debug" = {
"context.properties" = {
# Output Debug log messages as opposed to only the default level (Notice)
@ -88,7 +89,8 @@ in
}
];
};
}'';
}
'';
description = ''
Additional configuration for the WirePlumber daemon when run in
single-instance mode (the default in nixpkgs and currently the only
@ -166,7 +168,8 @@ in
configPackages = mkOption {
type = listOf package;
default = [ ];
example = literalExpression ''[
example = literalExpression ''
[
(pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/10-bluez.conf" '''
monitor.bluez.properties = {
bluez5.roles = [ a2dp_sink a2dp_source bap_sink bap_source hsp_hs hsp_ag hfp_hf hfp_ag ]
@ -175,7 +178,8 @@ in
bluez5.hfphsp-backend = "native"
}
''')
]'';
]
'';
description = ''
List of packages that provide WirePlumber configuration, in the form of
`share/wireplumber/*/*.conf` files.

7
nixos/modules/services/misc/gitlab.nix
View file

@ -1080,12 +1080,13 @@ in {
warnings = [
(mkIf
(cfg.registry.enable && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0" && cfg.registry.package == pkgs.docker-distribution)
''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
''
Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
Please back up your data and migrate to the gitlab-container-registry package.''
)
(mkIf
(versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0")
''GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
(versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0") ''
GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
Check the upstream documentation for a workaround: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later''
)
];

3
nixos/modules/services/network-filesystems/ceph.nix
View file

@ -42,7 +42,8 @@ let
StateDirectory = stateDirectory;
User = "ceph";
Group = if daemonType == "osd" then "disk" else "ceph";
ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
ExecStart = ''
${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
-f --cluster ${clusterName} --id ${daemonId}'';
} // lib.optionalAttrs (daemonType == "osd") {
ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}";

3
nixos/modules/services/networking/smokeping.nix
View file

@ -119,7 +119,8 @@ in
MAX 0.5 144 7200
MIN 0.5 144 7200
'';
description = ''Configure the ping frequency and retention of the rrd files.
description = ''
Configure the ping frequency and retention of the rrd files.
Once set, changing the interval will require deletion or migration of all
the collected data.'';
};

6
nixos/modules/services/networking/tinyproxy.nix
View file

@ -33,14 +33,16 @@ in
settings = mkOption {
description = "Configuration for [tinyproxy](https://tinyproxy.github.io/).";
default = { };
example = literalExpression ''{
example = literalExpression ''
{
Port 8888;
Listen 127.0.0.1;
Timeout 600;
Allow 127.0.0.1;
Anonymous = ['"Host"' '"Authorization"'];
ReversePath = '"/example/" "http://www.example.com/"';
}'';
}
'';
type = types.submodule ({name, ...}: {
freeformType = settingsFormat.type;
options = {

9
nixos/modules/services/networking/wg-quick.nix
View file

@ -194,7 +194,8 @@ let
allowedIPs = mkOption {
example = [ "10.192.122.3/32" "10.192.124.1/24" ];
type = with types; listOf str;
description = ''List of IP (v4 or v6) addresses with CIDR masks from
description = ''
List of IP (v4 or v6) addresses with CIDR masks from
which this peer is allowed to send incoming traffic and to which
outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
be specified for matching all IPv4 addresses, and ::/0 may be specified
@ -205,7 +206,8 @@ let
default = null;
example = "demo.wireguard.io:12913";
type = with types; nullOr str;
description = ''Endpoint IP or hostname of the peer, followed by a colon,
description = ''
Endpoint IP or hostname of the peer, followed by a colon,
and then a port number of the peer.'';
};
@ -213,7 +215,8 @@ let
default = null;
type = with types; nullOr int;
example = 25;
description = ''This is optional and is by default off, because most
description = ''
This is optional and is by default off, because most
users will not need it. It represents, in seconds, between 1 and 65535
inclusive, how often to send an authenticated empty packet to the peer,
for the purpose of keeping a stateful firewall or NAT mapping valid

12
nixos/modules/services/networking/wireguard.nix
View file

@ -127,7 +127,8 @@ let
default = null;
type = with types; nullOr str;
example = "container";
description = ''The pre-existing network namespace in which the
description = ''
The pre-existing network namespace in which the
WireGuard interface is created, and which retains the socket even if the
interface is moved via {option}`interfaceNamespace`. When
`null`, the interface is created in the init namespace.
@ -139,7 +140,8 @@ let
default = null;
type = with types; nullOr str;
example = "init";
description = ''The pre-existing network namespace the WireGuard
description = ''
The pre-existing network namespace the WireGuard
interface is moved to. The special value `init` means
the init namespace. When `null`, the interface is not
moved.
@ -240,7 +242,8 @@ let
allowedIPs = mkOption {
example = [ "10.192.122.3/32" "10.192.124.1/24" ];
type = with types; listOf str;
description = ''List of IP (v4 or v6) addresses with CIDR masks from
description = ''
List of IP (v4 or v6) addresses with CIDR masks from
which this peer is allowed to send incoming traffic and to which
outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
be specified for matching all IPv4 addresses, and ::/0 may be specified
@ -300,7 +303,8 @@ let
default = null;
type = with types; nullOr int;
example = 25;
description = ''This is optional and is by default off, because most
description = ''
This is optional and is by default off, because most
users will not need it. It represents, in seconds, between 1 and 65535
inclusive, how often to send an authenticated empty packet to the peer,
for the purpose of keeping a stateful firewall or NAT mapping valid

3
nixos/modules/services/web-apps/galene.nix
View file

@ -143,7 +143,8 @@ in
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.stateDir;
ExecStart = ''${cfg.package}/bin/galene \
ExecStart = ''
${cfg.package}/bin/galene \
${optionalString (cfg.insecure) "-insecure"} \
-data ${cfg.dataDir} \
-groups ${cfg.groupsDir} \

6
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -768,7 +768,8 @@ in {
description = ''
Extra options which should be appended to Nextcloud's config.php file.
'';
example = literalExpression '' {
example = literalExpression ''
{
redis = {
host = "/run/redis/redis.sock";
port = 0;
@ -776,7 +777,8 @@ in {
password = "secret";
timeout = 1.5;
};
} '';
}
'';
};
secretFile = mkOption {

4
nixos/modules/system/activation/top-level.nix
View file

@ -319,8 +319,8 @@ in
system.extraSystemBuilderCmds =
optionalString
config.system.copySystemConfiguration
''ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \
config.system.copySystemConfiguration ''
ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \
"$out/configuration.nix"
'' +
optionalString