diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2023-07-12 12:37:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 12:37:08 +0200 |
| commit | e1163b27ddc1da17fb5920c53686abd11728eb5c (patch) | |
| tree | 6cadfb69dffbea5b361fed161d680b180fcc8a06 /nixos | |
| parent | 91cba67bc166837478c204fb3cf3c5c8ef211801 (diff) | |
| parent | 4d4c73ff78a0ddc17dff2080177d19e5ff14b3af (diff) | |
| download | nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.tar nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.tar.gz nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.tar.bz2 nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.tar.lz nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.tar.xz nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.tar.zst nixlib-e1163b27ddc1da17fb5920c53686abd11728eb5c.zip | |
Merge pull request #242912 from chayleaf/fix-getent
treewide: update path to getent
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/home-automation/evcc.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/matrix/appservice-irc.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/heisenbridge.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/tailscale.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix index efa2cf244313..d0ce3fb4a1ce 100644 --- a/nixos/modules/services/home-automation/evcc.nix +++ b/nixos/modules/services/home-automation/evcc.nix @@ -50,7 +50,7 @@ in ]; environment.HOME = "/var/lib/evcc"; path = with pkgs; [ - glibc # requires getent + getent ]; serviceConfig = { ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}"; diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index 388553d4182e..5526df785c35 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -187,7 +187,7 @@ in { sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile} fi # Allow synapse access to the registration - if ${getBin pkgs.glibc}/bin/getent group matrix-synapse > /dev/null; then + if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then chgrp matrix-synapse ${registrationFile} chmod g+r ${registrationFile} fi diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix index d07e0e420462..822a09d7cd4d 100644 --- a/nixos/modules/services/misc/heisenbridge.nix +++ b/nixos/modules/services/misc/heisenbridge.nix @@ -137,7 +137,7 @@ in mv -f ${registrationFile}.new ${registrationFile} # Grant Synapse access to the registration - if ${getBin pkgs.glibc}/bin/getent group matrix-synapse > /dev/null; then + if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then chgrp -v matrix-synapse ${registrationFile} chmod -v g+r ${registrationFile} fi diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 384c86bd879e..6eeee71e8345 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -59,7 +59,7 @@ in { path = [ config.networking.resolvconf.package # for configuring DNS in some configs pkgs.procps # for collecting running services (opt-in feature) - pkgs.glibc # for `getent` to look up user shells + pkgs.getent # for `getent` to look up user shells pkgs.kmod # required to pass tailscale's v6nat check ]; serviceConfig.Environment = [ |