diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-19 09:55:32 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-19 09:55:32 +0100 |
| commit | e343a85cfb67ebaabd507359128c908254ee329a (patch) | |
| tree | 41639c511e90c79bb0aaf2fa63904f33a325b947 /nixos | |
| parent | 5f575e7339eeea6b58e8566357cc580713e0a30d (diff) | |
| parent | c4cad8cfa7ba1c66199e064c93fe3525e919cb82 (diff) | |
| download | nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.tar nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.tar.gz nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.tar.bz2 nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.tar.lz nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.tar.xz nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.tar.zst nixpkgs-e343a85cfb67ebaabd507359128c908254ee329a.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/desktops/accountsservice.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/networking/oidentd.nix | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index 933b9da2c83..c48036a99e8 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -39,14 +39,14 @@ with lib; systemd.packages = [ pkgs.accountsservice ]; - systemd.services.accounts-daemon = { + systemd.services.accounts-daemon = recursiveUpdate { wantedBy = [ "graphical.target" ]; # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice environment.XDG_DATA_DIRS = "${config.system.path}/share"; - } // (optionalAttrs (!config.users.mutableUsers) { + } (optionalAttrs (!config.users.mutableUsers) { environment.NIXOS_USERS_PURE = "true"; }); }; diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index 8cf34623ab5..feb84806ba9 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -28,8 +28,7 @@ with lib; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "forking"; - script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" + - optionalString config.networking.enableIPv6 " -a ::"; + script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup"; }; users.users.oidentd = { |