utillinux: rename to util-linux

nixos/lib/make-disk-image.nix

@@ -134,7 +134,7 @@ let format' = format; in let
 
  binPath = with pkgs; makeBinPath (
  [ rsync
- utillinux
+ util-linux
  parted
  e2fsprogs
  lkl
@@ -239,7 +239,7 @@ let format' = format; in let
 in pkgs.vmTools.runInLinuxVM (
  pkgs.runCommand name
  { preVM = prepareImage;
- buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ];
+ buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ];
  postVM = ''
  ${if format == "raw" then ''
  mv $diskImage $out/${filename}

nixos/modules/config/swap.nix

@@ -187,7 +187,7 @@ in
  before = [ "${realDevice'}.swap" ];
  # If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot
  after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ];
- path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
+ path = [ pkgs.util-linux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
 
  script =
  ''

nixos/modules/config/system-path.nix

@@ -37,7 +37,7 @@ let
  pkgs.procps
  pkgs.su
  pkgs.time
- pkgs.utillinux
+ pkgs.util-linux
  pkgs.which
  pkgs.zstd
  ];

nixos/modules/config/zram.nix

@@ -149,8 +149,8 @@ in
  print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024)
  }' /proc/meminfo)
 
- ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
- ${pkgs.utillinux}/sbin/mkswap /dev/${dev}
+ ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
+ ${pkgs.util-linux}/sbin/mkswap /dev/${dev}
  '';
  restartIfChanged = false;
  };

nixos/modules/installer/cd-dvd/sd-image.nix

@@ -147,10 +147,10 @@ in
  sdImage.storePaths = [ config.system.build.toplevel ];
 
  system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs,
- mtools, libfaketime, utillinux, zstd }: stdenv.mkDerivation {
+ mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation {
  name = config.sdImage.imageName;
 
- nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux zstd ];
+ nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ];
 
  inherit (config.sdImage) compressImage;
 
@@ -221,7 +221,7 @@ in
  set -euo pipefail
  set -x
  # Figure out device names for the boot device and root filesystem.
- rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /)
+ rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /)
  bootDevice=$(lsblk -npo PKNAME $rootPart)
 
  # Resize the root partition and the filesystem to fit the disk

nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix

@@ -96,7 +96,7 @@ in
 
  boot.initrd.extraUtilsCommands =
  ''
- copy_bin_and_libs ${pkgs.utillinux}/sbin/hwclock
+ copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
  '';
 
  boot.initrd.postDeviceCommands =

nixos/modules/programs/x2goserver.nix

@@ -110,7 +110,7 @@ in {
  "L+ /usr/local/bin/chmod - - - - ${coreutils}/bin/chmod"
  "L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp"
  "L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed"
- "L+ /usr/local/bin/setsid - - - - ${utillinux}/bin/setsid"
+ "L+ /usr/local/bin/setsid - - - - ${util-linux}/bin/setsid"
  "L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr"
  "L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap"
  ];

nixos/modules/security/pam_mount.nix

@@ -60,7 +60,7 @@ in
  <!-- if activated, requires ofl from hxtools to be present -->
  <logout wait="0" hup="no" term="no" kill="no" />
  <!-- set PATH variable for pam_mount module -->
- <path>${pkgs.utillinux}/bin</path>
+ <path>${pkgs.util-linux}/bin</path>
  <!-- create mount point if not present -->
  <mkmountpoint enable="1" remove="true" />
 

nixos/modules/security/wrappers/default.nix

@@ -163,8 +163,8 @@ in
  # These are mount related wrappers that require the +s permission.
  fusermount.source = "${pkgs.fuse}/bin/fusermount";
  fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";
- mount.source = "${lib.getBin pkgs.utillinux}/bin/mount";
- umount.source = "${lib.getBin pkgs.utillinux}/bin/umount";
+ mount.source = "${lib.getBin pkgs.util-linux}/bin/mount";
+ umount.source = "${lib.getBin pkgs.util-linux}/bin/umount";
  };
 
  boot.specialFileSystems.${parentWrapperDir} = {

nixos/modules/services/admin/salt/master.nix

@@ -45,7 +45,7 @@ in
  wantedBy = [ "multi-user.target" ];
  after = [ "network.target" ];
  path = with pkgs; [
- utillinux # for dmesg
+ util-linux # for dmesg
  ];
  serviceConfig = {
  ExecStart = "${pkgs.salt}/bin/salt-master";

nixos/modules/services/admin/salt/minion.nix

@@ -50,7 +50,7 @@ in
  wantedBy = [ "multi-user.target" ];
  after = [ "network.target" ];
  path = with pkgs; [
- utillinux
+ util-linux
  ];
  serviceConfig = {
  ExecStart = "${pkgs.salt}/bin/salt-minion";

nixos/modules/services/backup/tarsnap.nix

@@ -308,7 +308,7 @@ in
  requires = [ "network-online.target" ];
  after = [ "network-online.target" ];
 
- path = with pkgs; [ iputils tarsnap utillinux ];
+ path = with pkgs; [ iputils tarsnap util-linux ];
 
  # In order for the persistent tarsnap timer to work reliably, we have to
  # make sure that the tarsnap server is reachable after systemd starts up
@@ -355,7 +355,7 @@ in
  description = "Tarsnap restore '${name}'";
  requires = [ "network-online.target" ];
 
- path = with pkgs; [ iputils tarsnap utillinux ];
+ path = with pkgs; [ iputils tarsnap util-linux ];
 
  script = let
  tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';

nixos/modules/services/cluster/kubernetes/kubelet.nix

@@ -241,7 +241,7 @@ in
  description = "Kubernetes Kubelet Service";
  wantedBy = [ "kubernetes.target" ];
  after = [ "network.target" "docker.service" "kube-apiserver.service" ];
- path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
+ path = with pkgs; [ gitMinimal openssh docker util-linux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
  preStart = ''
  ${concatMapStrings (img: ''
  echo "Seeding docker image: ${img}"

nixos/modules/services/computing/torque/mom.nix

@@ -32,7 +32,7 @@ in
  environment.systemPackages = [ pkgs.torque ];
 
  systemd.services.torque-mom-init = {
- path = with pkgs; [ torque utillinux procps inetutils ];
+ path = with pkgs; [ torque util-linux procps inetutils ];
 
  script = ''
  pbs_mkdirs -v aux

nixos/modules/services/computing/torque/server.nix

@@ -21,7 +21,7 @@ in
  environment.systemPackages = [ pkgs.torque ];
 
  systemd.services.torque-server-init = {
- path = with pkgs; [ torque utillinux procps inetutils ];
+ path = with pkgs; [ torque util-linux procps inetutils ];
 
  script = ''
  tmpsetup=$(mktemp -t torque-XXXX)

nixos/modules/services/continuous-integration/gitlab-runner.nix

@@ -541,7 +541,7 @@ in
  jq
  moreutils
  remarshal
- utillinux
+ util-linux
  cfg.package
  ] ++ cfg.extraPackages;
  reloadIfChanged = true;

nixos/modules/services/databases/riak.nix

@@ -118,7 +118,7 @@ in
  after = [ "network.target" ];
 
  path = [
- pkgs.utillinux # for `logger`
+ pkgs.util-linux # for `logger`
  pkgs.bash
  ];
 

nixos/modules/services/desktops/profile-sync-daemon.nix

@@ -36,7 +36,7 @@ in {
  description = "Profile Sync daemon";
  wants = [ "psd-resync.service" ];
  wantedBy = [ "default.target" ];
- path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+ path = with pkgs; [ rsync kmod gawk nettools util-linux profile-sync-daemon ];
  unitConfig = {
  RequiresMountsFor = [ "/home/" ];
  };
@@ -55,7 +55,7 @@ in {
  wants = [ "psd-resync.timer" ];
  partOf = [ "psd.service" ];
  wantedBy = [ "default.target" ];
- path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+ path = with pkgs; [ rsync kmod gawk nettools util-linux profile-sync-daemon ];
  serviceConfig = {
  Type = "oneshot";
  ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";

nixos/modules/services/hardware/udev.nix

@@ -57,8 +57,8 @@ let
  substituteInPlace $i \
  --replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \
  --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
- --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
- --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \
+ --replace \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \
+ --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \
  --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
  --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
  done
@@ -280,7 +280,7 @@ in
 
  services.udev.packages = [ extraUdevRules extraHwdbFile ];
 
- services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
+ services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.util-linux udev ];
 
  boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
 

nixos/modules/services/misc/fstrim.nix

@@ -31,7 +31,7 @@ in {
 
  config = mkIf cfg.enable {
 
- systemd.packages = [ pkgs.utillinux ];
+ systemd.packages = [ pkgs.util-linux ];
 
  systemd.timers.fstrim = {
  timerConfig = {

nixos/modules/services/misc/gitlab.nix

@@ -658,7 +658,7 @@ in {
  script = ''
  set -eu
 
- PSQL="${pkgs.utillinux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
+ PSQL="${pkgs.util-linux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
 
  $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
  current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")

nixos/modules/services/misc/matrix-synapse.nix

@@ -713,7 +713,7 @@ in {
  ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
  --keys-directory ${cfg.dataDir}
  '';
- ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID";
+ ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
  Restart = "on-failure";
  };
  };

nixos/modules/services/misc/nix-daemon.nix

@@ -539,7 +539,7 @@ in
  systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
 
  systemd.services.nix-daemon =
- { path = [ nix pkgs.utillinux config.programs.ssh.package ]
+ { path = [ nix pkgs.util-linux config.programs.ssh.package ]
  ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
 
  environment = cfg.envVars

nixos/modules/services/monitoring/netdata.nix

@@ -142,7 +142,7 @@ in {
  serviceConfig = {
  Environment="PYTHONPATH=${cfg.package}/libexec/netdata/python.d/python_modules";
  ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
- ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
+ ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
  TimeoutStopSec = 60;
  Restart = "on-failure";
  # User and group

nixos/modules/services/monitoring/smartd.nix

@@ -36,7 +36,7 @@ let
 
  $SMARTD_MESSAGE
  EOF
- } | ${pkgs.utillinux}/bin/wall 2>/dev/null
+ } | ${pkgs.util-linux}/bin/wall 2>/dev/null
  ''}
  ${optionalString nx.enable ''
  export DISPLAY=${nx.display}

nixos/modules/services/network-filesystems/openafs/client.nix

@@ -244,7 +244,7 @@ in
  # postStop, then we get a hang + kernel oops, because AFS can't be
  # stopped simply by sending signals to processes.
  preStop = ''
- ${pkgs.utillinux}/bin/umount ${cfg.mountPoint}
+ ${pkgs.util-linux}/bin/umount ${cfg.mountPoint}
  ${openafsBin}/sbin/afsd -shutdown
  ${pkgs.kmod}/sbin/rmmod libafs
  '';

nixos/modules/services/network-filesystems/xtreemfs.nix

@@ -112,7 +112,7 @@ in
  description = ''
  Must be set to a unique identifier, preferably a UUID according to
  RFC 4122. UUIDs can be generated with `uuidgen` command, found in
- the `utillinux` package.
+ the `util-linux` package.
  '';
  };
  port = mkOption {
@@ -232,7 +232,7 @@ in
  description = ''
  Must be set to a unique identifier, preferably a UUID according to
  RFC 4122. UUIDs can be generated with `uuidgen` command, found in
- the `utillinux` package.
+ the `util-linux` package.
  '';
  };
  port = mkOption {
@@ -370,7 +370,7 @@ in
  description = ''
  Must be set to a unique identifier, preferably a UUID according to
  RFC 4122. UUIDs can be generated with `uuidgen` command, found in
- the `utillinux` package.
+ the `util-linux` package.
  '';
  };
  port = mkOption {

nixos/modules/services/networking/networkmanager.nix

@@ -465,7 +465,7 @@ in {
  restartTriggers = [ configFile overrideNameserversScript ];
 
  # useful binaries for user-specified hooks
- path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
+ path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ];
  aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
  };
 

nixos/modules/services/networking/strongswan-swanctl/module.nix

@@ -63,7 +63,7 @@ in {
  description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";
  wantedBy = [ "multi-user.target" ];
  after = [ "network-online.target" ];
- path = with pkgs; [ kmod iproute iptables utillinux ];
+ path = with pkgs; [ kmod iproute iptables util-linux ];
  environment = {
  STRONGSWAN_CONF = pkgs.writeTextFile {
  name = "strongswan.conf";

nixos/modules/services/networking/strongswan.nix

@@ -152,7 +152,7 @@ in
  systemd.services.strongswan = {
  description = "strongSwan IPSec Service";
  wantedBy = [ "multi-user.target" ];
- path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
+ path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux
  after = [ "network-online.target" ];
  environment = {
  STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };

nixos/modules/services/system/cloud-init.nix

@@ -9,7 +9,7 @@ let cfg = config.services.cloud-init;
  nettools
  openssh
  shadow
- utillinux
+ util-linux
  ] ++ optional cfg.btrfs.enable btrfs-progs
  ++ optional cfg.ext4.enable e2fsprogs
  ;

nixos/modules/services/torrent/transmission.nix

@@ -397,9 +397,9 @@ in
  mr ${getLib pkgs.openssl}/lib/libcrypto*.so*,
  mr ${getLib pkgs.openssl}/lib/libssl*.so*,
  mr ${getLib pkgs.systemd}/lib/libsystemd*.so*,
- mr ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so*,
- mr ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so*,
- mr ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so*,
+ mr ${getLib pkgs.util-linuxMinimal.out}/lib/libblkid.so*,
+ mr ${getLib pkgs.util-linuxMinimal.out}/lib/libmount.so*,
+ mr ${getLib pkgs.util-linuxMinimal.out}/lib/libuuid.so*,
  mr ${getLib pkgs.xz}/lib/liblzma*.so*,
  mr ${getLib pkgs.zlib}/lib/libz*.so*,
 

nixos/modules/services/ttys/agetty.nix

@@ -5,7 +5,7 @@ with lib;
 let
 
  autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
- gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
+ gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
 
 in
 

nixos/modules/services/web-apps/gerrit.nix

@@ -143,7 +143,7 @@ in
  Set a UUID that uniquely identifies the server.
 
  This can be generated with
- <literal>nix-shell -p utillinux --run uuidgen</literal>.
+ <literal>nix-shell -p util-linux --run uuidgen</literal>.
  '';
  };
  };

nixos/modules/services/web-servers/apache-httpd/default.nix

@@ -750,8 +750,8 @@ in
  # Get rid of old semaphores. These tend to accumulate across
  # server restarts, eventually preventing it from restarting
  # successfully.
- for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
- ${pkgs.utillinux}/bin/ipcrm -s $i
+ for i in $(${pkgs.util-linux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
+ ${pkgs.util-linux}/bin/ipcrm -s $i
  done
  '';