mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 19:55:41 +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
162 lines
3.6 KiB
Nix
162 lines
3.6 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
|
|
let
|
|
inherit (lib.attrsets) optionalAttrs;
|
|
inherit (lib.generators) toINIWithGlobalSection;
|
|
inherit (lib.lists) optional;
|
|
inherit (lib.modules) mkIf mkRemovedOptionModule;
|
|
inherit (lib.options) literalExpression mkEnableOption mkOption;
|
|
inherit (lib.strings) escape;
|
|
inherit (lib.types)
|
|
attrsOf
|
|
bool
|
|
int
|
|
lines
|
|
oneOf
|
|
str
|
|
submodule
|
|
;
|
|
|
|
cfg = config.services.davfs2;
|
|
|
|
escapeString = escape [
|
|
"\""
|
|
"\\"
|
|
];
|
|
|
|
formatValue =
|
|
value:
|
|
if true == value then
|
|
"1"
|
|
else if false == value then
|
|
"0"
|
|
else if builtins.isString value then
|
|
"\"${escapeString value}\""
|
|
else
|
|
toString value;
|
|
|
|
configFile = pkgs.writeText "davfs2.conf" (
|
|
toINIWithGlobalSection {
|
|
mkSectionName = escapeString;
|
|
mkKeyValue = k: v: "${k} ${formatValue v}";
|
|
} cfg.settings
|
|
);
|
|
in
|
|
{
|
|
|
|
imports = [
|
|
(mkRemovedOptionModule [ "services" "davfs2" "extraConfig" ] ''
|
|
The option extraConfig got removed, please migrate to
|
|
services.davfs2.settings instead.
|
|
'')
|
|
];
|
|
|
|
options.services.davfs2 = {
|
|
enable = mkEnableOption "davfs2";
|
|
|
|
davUser = mkOption {
|
|
type = str;
|
|
default = "davfs2";
|
|
description = ''
|
|
When invoked by root the mount.davfs daemon will run as this user.
|
|
Value must be given as name, not as numerical id.
|
|
'';
|
|
};
|
|
|
|
davGroup = mkOption {
|
|
type = str;
|
|
default = "davfs2";
|
|
description = ''
|
|
The group of the running mount.davfs daemon. Ordinary users must be
|
|
member of this group in order to mount a davfs2 file system. Value must
|
|
be given as name, not as numerical id.
|
|
'';
|
|
};
|
|
|
|
settings = mkOption {
|
|
type = submodule {
|
|
freeformType =
|
|
let
|
|
valueTypes = [
|
|
bool
|
|
int
|
|
str
|
|
];
|
|
in
|
|
attrsOf (attrsOf (oneOf (valueTypes ++ [ (attrsOf (oneOf valueTypes)) ])));
|
|
};
|
|
default = { };
|
|
example = literalExpression ''
|
|
{
|
|
globalSection = {
|
|
proxy = "foo.bar:8080";
|
|
use_locks = false;
|
|
};
|
|
sections = {
|
|
"/media/dav" = {
|
|
use_locks = true;
|
|
};
|
|
"/home/otto/mywebspace" = {
|
|
gui_optimize = true;
|
|
};
|
|
};
|
|
}
|
|
'';
|
|
description = ''
|
|
Extra settings appended to the configuration of davfs2.
|
|
See {manpage}`davfs2.conf(5)` for available settings.
|
|
'';
|
|
};
|
|
};
|
|
|
|
config = mkIf cfg.enable {
|
|
|
|
environment.systemPackages = [ pkgs.davfs2 ];
|
|
environment.etc."davfs2/davfs2.conf".source = configFile;
|
|
|
|
services.davfs2.settings = {
|
|
globalSection = {
|
|
dav_user = cfg.davUser;
|
|
dav_group = cfg.davGroup;
|
|
};
|
|
};
|
|
|
|
users.groups = optionalAttrs (cfg.davGroup == "davfs2") {
|
|
davfs2.gid = config.ids.gids.davfs2;
|
|
};
|
|
|
|
users.users = optionalAttrs (cfg.davUser == "davfs2") {
|
|
davfs2 = {
|
|
createHome = false;
|
|
group = cfg.davGroup;
|
|
uid = config.ids.uids.davfs2;
|
|
description = "davfs2 user";
|
|
};
|
|
};
|
|
|
|
security.wrappers."mount.davfs" = {
|
|
program = "mount.davfs";
|
|
source = "${pkgs.davfs2}/bin/mount.davfs";
|
|
owner = "root";
|
|
group = cfg.davGroup;
|
|
setuid = true;
|
|
permissions = "u+rx,g+x";
|
|
};
|
|
|
|
security.wrappers."umount.davfs" = {
|
|
program = "umount.davfs";
|
|
source = "${pkgs.davfs2}/bin/umount.davfs";
|
|
owner = "root";
|
|
group = cfg.davGroup;
|
|
setuid = true;
|
|
permissions = "u+rx,g+x";
|
|
};
|
|
|
|
};
|
|
|
|
}
|