diff options
| author | chayleaf <chayleaf-git@pavluk.org> | 2023-07-12 02:32:23 +0700 |
|---|---|---|
| committer | chayleaf <chayleaf-git@pavluk.org> | 2023-07-12 02:32:23 +0700 |
| commit | 4d4c73ff78a0ddc17dff2080177d19e5ff14b3af (patch) | |
| tree | 7137f3de3b6a65437a3fdb84ae2d5ea9216ad546 | |
| parent | e2078e747c791cf839664d584628f5f2ee89a32a (diff) | |
| download | nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.tar nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.tar.gz nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.tar.bz2 nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.tar.lz nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.tar.xz nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.tar.zst nixpkgs-4d4c73ff78a0ddc17dff2080177d19e5ff14b3af.zip | |
treewide: update path to getent
| -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 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix index efa2cf24431..d0ce3fb4a1c 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 388553d4182..5526df785c3 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 d07e0e42046..822a09d7cd4 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 384c86bd879..6eeee71e834 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 = [ diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 1328f5468ed..431be3b79d7 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -2,7 +2,7 @@ autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc, rpcsvc-proto, libtirpc, gperftools, nixosTests + rsync, getent, rpcsvc-proto, libtirpc, gperftools, nixosTests }: let # NOTE: On each glusterfs release, it should be checked if gluster added @@ -42,7 +42,7 @@ let e2fsprogs # tune2fs findutils # find gawk # awk - glibc # getent + getent # getent gnugrep # grep gnused # sed lvm2 # lvs |