diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-11-24 10:29:28 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2020-11-24 12:42:06 -0500 |
| commit | bc49a0815ae860010b4d593b02f00ab6f07d50ea (patch) | |
| tree | 1435af86f0f2172632621a400f27a44599751f17 /nixos/tests | |
| parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) | |
| download | nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.gz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.bz2 nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.lz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.xz nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.tar.zst nixpkgs-bc49a0815ae860010b4d593b02f00ab6f07d50ea.zip | |
utillinux: rename to util-linux
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/os-prober.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/systemd.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/virtualbox.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index be0235a4175..f778d30bdc0 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -9,7 +9,7 @@ let ${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s mkdir /mnt ${e2fsprogs}/bin/mkfs.ext4 /dev/vda1 - ${utillinux}/bin/mount -t ext4 /dev/vda1 /mnt + ${util-linux}/bin/mount -t ext4 /dev/vda1 /mnt if test -e /mnt/.debug; then exec ${bash}/bin/sh diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index dfa16eecfad..0fc788f860f 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { systemd.shutdown.test = pkgs.writeScript "test.shutdown" '' #!${pkgs.runtimeShell} - PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])} + PATH=${lib.makeBinPath (with pkgs; [ util-linux coreutils ])} mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared touch /tmp/shared/shutdown-test umount /tmp/shared diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 0d9eafa4a20..900ee610a70 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -24,7 +24,7 @@ let miniInit = '' #!${pkgs.runtimeShell} -xe - export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}" + export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.util-linux ]}" mkdir -p /run/dbus cat > /etc/passwd <<EOF @@ -72,7 +72,7 @@ let boot.initrd.extraUtilsCommands = '' copy_bin_and_libs "${guestAdditions}/bin/mount.vboxsf" - copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" + copy_bin_and_libs "${pkgs.util-linux}/bin/unshare" ${(attrs.extraUtilsCommands or (const "")) pkgs} ''; @@ -122,7 +122,7 @@ let "$diskImage" "$out/disk.vdi" ''; - buildInputs = [ pkgs.utillinux pkgs.perl ]; + buildInputs = [ pkgs.util-linux pkgs.perl ]; } '' ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s |