mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 20:55:31 +03:00

After final improvements to the official formatter implementation, this commit now performs the first treewide reformat of Nix files using it. This is part of the implementation of RFC 166. Only "inactive" files are reformatted, meaning only files that aren't being touched by any PR with activity in the past 2 months. This is to avoid conflicts for PRs that might soon be merged. Later we can do a full treewide reformat to get the rest, which should not cause as many conflicts. A CI check has already been running for some time to ensure that new and already-formatted files are formatted, so the files being reformatted here should also stay formatted. This commit was automatically created and can be verified using nix-builda08b3a4d19
.tar.gz \ --argstr baseRevb32a094368
result/bin/apply-formatting $NIXPKGS_PATH
207 lines
4.5 KiB
Nix
207 lines
4.5 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
utils,
|
|
...
|
|
}:
|
|
|
|
with utils.systemdUtils.unitOptions;
|
|
with utils.systemdUtils.lib;
|
|
with lib;
|
|
|
|
let
|
|
cfg = config.systemd.nspawn;
|
|
|
|
checkExec = checkUnitConfig "Exec" [
|
|
(assertOnlyFields [
|
|
"Boot"
|
|
"ProcessTwo"
|
|
"Parameters"
|
|
"Environment"
|
|
"User"
|
|
"WorkingDirectory"
|
|
"PivotRoot"
|
|
"Capability"
|
|
"DropCapability"
|
|
"NoNewPrivileges"
|
|
"KillSignal"
|
|
"Personality"
|
|
"MachineID"
|
|
"PrivateUsers"
|
|
"NotifyReady"
|
|
"SystemCallFilter"
|
|
"LimitCPU"
|
|
"LimitFSIZE"
|
|
"LimitDATA"
|
|
"LimitSTACK"
|
|
"LimitCORE"
|
|
"LimitRSS"
|
|
"LimitNOFILE"
|
|
"LimitAS"
|
|
"LimitNPROC"
|
|
"LimitMEMLOCK"
|
|
"LimitLOCKS"
|
|
"LimitSIGPENDING"
|
|
"LimitMSGQUEUE"
|
|
"LimitNICE"
|
|
"LimitRTPRIO"
|
|
"LimitRTTIME"
|
|
"OOMScoreAdjust"
|
|
"CPUAffinity"
|
|
"Hostname"
|
|
"ResolvConf"
|
|
"Timezone"
|
|
"LinkJournal"
|
|
"Ephemeral"
|
|
"AmbientCapability"
|
|
])
|
|
(assertValueOneOf "Boot" boolValues)
|
|
(assertValueOneOf "ProcessTwo" boolValues)
|
|
(assertValueOneOf "NotifyReady" boolValues)
|
|
];
|
|
|
|
checkFiles = checkUnitConfig "Files" [
|
|
(assertOnlyFields [
|
|
"ReadOnly"
|
|
"Volatile"
|
|
"Bind"
|
|
"BindReadOnly"
|
|
"TemporaryFileSystem"
|
|
"Overlay"
|
|
"OverlayReadOnly"
|
|
"PrivateUsersChown"
|
|
"BindUser"
|
|
"Inaccessible"
|
|
"PrivateUsersOwnership"
|
|
])
|
|
(assertValueOneOf "ReadOnly" boolValues)
|
|
(assertValueOneOf "Volatile" (boolValues ++ [ "state" ]))
|
|
(assertValueOneOf "PrivateUsersChown" boolValues)
|
|
(assertValueOneOf "PrivateUsersOwnership" [
|
|
"off"
|
|
"chown"
|
|
"map"
|
|
"auto"
|
|
])
|
|
];
|
|
|
|
checkNetwork = checkUnitConfig "Network" [
|
|
(assertOnlyFields [
|
|
"Private"
|
|
"VirtualEthernet"
|
|
"VirtualEthernetExtra"
|
|
"Interface"
|
|
"MACVLAN"
|
|
"IPVLAN"
|
|
"Bridge"
|
|
"Zone"
|
|
"Port"
|
|
])
|
|
(assertValueOneOf "Private" boolValues)
|
|
(assertValueOneOf "VirtualEthernet" boolValues)
|
|
];
|
|
|
|
instanceOptions = {
|
|
options = (getAttrs [ "enable" ] sharedOptions) // {
|
|
execConfig = mkOption {
|
|
default = { };
|
|
example = {
|
|
Parameters = "/bin/sh";
|
|
};
|
|
type = types.addCheck (types.attrsOf unitOption) checkExec;
|
|
description = ''
|
|
Each attribute in this set specifies an option in the
|
|
`[Exec]` section of this unit. See
|
|
{manpage}`systemd.nspawn(5)` for details.
|
|
'';
|
|
};
|
|
|
|
filesConfig = mkOption {
|
|
default = { };
|
|
example = {
|
|
Bind = [ "/home/alice" ];
|
|
};
|
|
type = types.addCheck (types.attrsOf unitOption) checkFiles;
|
|
description = ''
|
|
Each attribute in this set specifies an option in the
|
|
`[Files]` section of this unit. See
|
|
{manpage}`systemd.nspawn(5)` for details.
|
|
'';
|
|
};
|
|
|
|
networkConfig = mkOption {
|
|
default = { };
|
|
example = {
|
|
Private = false;
|
|
};
|
|
type = types.addCheck (types.attrsOf unitOption) checkNetwork;
|
|
description = ''
|
|
Each attribute in this set specifies an option in the
|
|
`[Network]` section of this unit. See
|
|
{manpage}`systemd.nspawn(5)` for details.
|
|
'';
|
|
};
|
|
};
|
|
|
|
};
|
|
|
|
instanceToUnit =
|
|
name: def:
|
|
let
|
|
base = {
|
|
text = ''
|
|
[Exec]
|
|
${attrsToSection def.execConfig}
|
|
|
|
[Files]
|
|
${attrsToSection def.filesConfig}
|
|
|
|
[Network]
|
|
${attrsToSection def.networkConfig}
|
|
'';
|
|
} // def;
|
|
in
|
|
base // { unit = makeUnit name base; };
|
|
|
|
in
|
|
{
|
|
|
|
options = {
|
|
|
|
systemd.nspawn = mkOption {
|
|
default = { };
|
|
type = with types; attrsOf (submodule instanceOptions);
|
|
description = "Definition of systemd-nspawn configurations.";
|
|
};
|
|
|
|
};
|
|
|
|
config =
|
|
let
|
|
units = mapAttrs' (
|
|
n: v:
|
|
let
|
|
nspawnFile = "${n}.nspawn";
|
|
in
|
|
nameValuePair nspawnFile (instanceToUnit nspawnFile v)
|
|
) cfg;
|
|
in
|
|
mkMerge [
|
|
(mkIf (cfg != { }) {
|
|
environment.etc."systemd/nspawn".source = mkIf (cfg != { }) (generateUnits {
|
|
allowCollisions = false;
|
|
type = "nspawn";
|
|
inherit units;
|
|
upstreamUnits = [ ];
|
|
upstreamWants = [ ];
|
|
});
|
|
})
|
|
{
|
|
systemd.targets.multi-user.wants = [ "machines.target" ];
|
|
systemd.services."systemd-nspawn@".environment = {
|
|
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY = mkDefault "1";
|
|
};
|
|
}
|
|
];
|
|
}
|