diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-02 18:34:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 18:34:53 -0400 |
| commit | e8e26becace83d7fb99fbadfb993590643fd4688 (patch) | |
| tree | d408f9a3ea0630c2d87993add0cadf3b48da1ed4 /nixos/modules/services/hardware | |
| parent | c1ffc65d1a0fdcb69b447711f9896077df550dd7 (diff) | |
| parent | d568d5016ac7bdf060e4ee255abe7f58937d2525 (diff) | |
| download | nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.tar nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.tar.gz nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.tar.bz2 nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.tar.lz nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.tar.xz nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.tar.zst nixlib-e8e26becace83d7fb99fbadfb993590643fd4688.zip | |
Merge pull request #42887 from matthewbauer/libsecurity-closure-reductions
Libsecurity closure reductions
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/sane.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/tcsd.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/usbmuxd.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index d651ccaa5776..fe05c5a5c06f 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -124,7 +124,7 @@ in environment.sessionVariables = env; services.udev.packages = backends; - users.extraGroups."scanner".gid = config.ids.gids.scanner; + users.groups."scanner".gid = config.ids.gids.scanner; }) (mkIf config.services.saned.enable { @@ -152,7 +152,7 @@ in }; }; - users.extraUsers."scanner" = { + users.users."scanner" = { uid = config.ids.uids.scanner; group = "scanner"; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d957b5063d38..d4b0a9495d75 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -137,13 +137,13 @@ in serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}"; }; - users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton + users.users = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; uid = config.ids.uids.tss; }); - users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton + users.groups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; gid = config.ids.gids.tss; }); diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 7ebd49fa01c2..6a3f7cfd210d 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -43,13 +43,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == defaultUserGroup) { + users.users = optional (cfg.user == defaultUserGroup) { name = cfg.user; description = "usbmuxd user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == defaultUserGroup) { + users.groups = optional (cfg.group == defaultUserGroup) { name = cfg.group; }; |