public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unixtools: get rid of modprobe

Browse Source 
modprobe only exists in Linux kernel. Just use kmod if it's needed.
This commit is contained in:
Matthew Bauer 2018-04-12 14:32:11 -05:00
parent 29bc523733
commit 6398791733
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/autofs/default.nix
View File

@ -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 }: , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
let let
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
export MOUNT=${mount}/bin/mount export MOUNT=${mount}/bin/mount
export MOUNT_NFS=${nfs-utils}/bin/mount.nfs export MOUNT_NFS=${nfs-utils}/bin/mount.nfs
export UMOUNT=${umount}/bin/umount export UMOUNT=${umount}/bin/umount
export MODPROBE=${modprobe}/bin/modprobe export MODPROBE=${kmod}/bin/modprobe
export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E2FSCK=${e2fsprogs}/bin/fsck.ext2
export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E3FSCK=${e2fsprogs}/bin/fsck.ext3
export E4FSCK=${e2fsprogs}/bin/fsck.ext4 export E4FSCK=${e2fsprogs}/bin/fsck.ext4

2
pkgs/top-level/all-packages.nix
View File

@ -21229,6 +21229,6 @@ with pkgs;
# Unix tools # Unix tools
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); 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; mount wall hostname more sysctl;
} }

3
pkgs/top-level/unix-tools.nix
View File

@ -63,9 +63,6 @@ in rec {
logger = singleBinary "logger" { logger = singleBinary "logger" {
linux = pkgs.utillinux; linux = pkgs.utillinux;
}; };
modprobe = singleBinary "modprobe" {
linux = pkgs.kmod;
};
more = singleBinary "more" { more = singleBinary "more" {
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = more_compat; darwin = more_compat;