utillinux: rename to util-linux

2020-11-24 12:42:06 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions
@@ -25,7 +25,7 @@ let
      stdenv.cc.libc # nscd in update-users-groups.pl
      shadow
      nettools # needed for hostname
-      utillinux # needed for mount and mountpoint
+      util-linux # needed for mount and mountpoint
    ];

  scriptType = with types;
@@ -97,10 +97,11 @@ let
    allowSubstitutes = false;
    buildCommand = systemBuilder;

-    inherit (pkgs) utillinux coreutils;
+    inherit (pkgs) coreutils;
    systemd = config.systemd.package;
    shell = "${pkgs.bash}/bin/sh";
    su = "${pkgs.shadow.su}/bin/su";
+    utillinux = pkgs.util-linux;

    kernelParams = config.boot.kernelParams;
    installBootLoader =