diff options
| -rw-r--r-- | pkgs/os-specific/linux/autofs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index a7472de1d025..859593e4b9aa 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, modprobe, nfs-utils, e2fsprogs +{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation { export MOUNT=${mount}/bin/mount export MOUNT_NFS=${nfs-utils}/bin/mount.nfs export UMOUNT=${umount}/bin/umount - export MODPROBE=${modprobe}/bin/modprobe + export MODPROBE=${kmod}/bin/modprobe export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 527e6e9cd143..4fc752a8ee1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21229,6 +21229,6 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); - inherit (unixtools) hexdump ps logger eject modprobe umount + inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl; } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 89f5e464d5aa..2d62d4e6c64c 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -63,9 +63,6 @@ in rec { logger = singleBinary "logger" { linux = pkgs.utillinux; }; - modprobe = singleBinary "modprobe" { - linux = pkgs.kmod; - }; more = singleBinary "more" { linux = pkgs.utillinux; darwin = more_compat; |