b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #242912 from chayleaf/fix-getent

Browse source 
treewide: update path to getent
This commit is contained in:
Rick van Schijndel 2023-07-12 12:37:08 +02:00 committed by GitHub
parent 91cba67bc1 4d4c73ff78
commit e1163b27dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/home-automation/evcc.nix
View file

@ -50,7 +50,7 @@ in
]; ];
environment.HOME = "/var/lib/evcc"; environment.HOME = "/var/lib/evcc";
path = with pkgs; [ path = with pkgs; [
glibc # requires getent getent
]; ];
serviceConfig = { serviceConfig = {
ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}"; ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}";

2
nixos/modules/services/matrix/appservice-irc.nix
View file

@ -187,7 +187,7 @@ in {
sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile} sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile}
fi fi
# Allow synapse access to the registration # 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} chgrp matrix-synapse ${registrationFile}
chmod g+r ${registrationFile} chmod g+r ${registrationFile}
fi fi

2
nixos/modules/services/misc/heisenbridge.nix
View file

@ -137,7 +137,7 @@ in
mv -f ${registrationFile}.new ${registrationFile} mv -f ${registrationFile}.new ${registrationFile}
# Grant Synapse access to the registration # 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} chgrp -v matrix-synapse ${registrationFile}
chmod -v g+r ${registrationFile} chmod -v g+r ${registrationFile}
fi fi

2
nixos/modules/services/networking/tailscale.nix
View file

@ -59,7 +59,7 @@ in {
path = [ path = [
config.networking.resolvconf.package # for configuring DNS in some configs config.networking.resolvconf.package # for configuring DNS in some configs
pkgs.procps # for collecting running services (opt-in feature) 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 pkgs.kmod # required to pass tailscale's v6nat check
]; ];
serviceConfig.Environment = [ serviceConfig.Environment = [

4
pkgs/tools/filesystems/glusterfs/default.nix
View file

@ -2,7 +2,7 @@
autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite,
liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which,
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, 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 let
# NOTE: On each glusterfs release, it should be checked if gluster added # NOTE: On each glusterfs release, it should be checked if gluster added
@ -42,7 +42,7 @@ let
e2fsprogs # tune2fs e2fsprogs # tune2fs
findutils # find findutils # find
gawk # awk gawk # awk
glibc # getent getent # getent
gnugrep # grep gnugrep # grep
gnused # sed gnused # sed
lvm2 # lvs lvm2 # lvs