diff options
| author | Mathnerd314 <mathnerd314.gph+hs@gmail.com> | 2015-09-05 17:11:03 -0600 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-13 10:55:44 +0200 |
| commit | 87012187b28b1316e7fb0ff584cfe97b79d794a6 (patch) | |
| tree | 0921a70365917122b8558dee1555b124588640a8 | |
| parent | 667f26cabf8a217b0259b969f43af4b2a4f7c8b2 (diff) | |
| download | nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.gz nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.bz2 nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.lz nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.xz nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.tar.zst nixlib-87012187b28b1316e7fb0ff584cfe97b79d794a6.zip | |
kmod-debian-aliases: init at 21-1
| -rw-r--r-- | nixos/modules/system/boot/modprobe.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 29 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index c49380899664..9bb10eac9880 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -85,11 +85,7 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; - environment.etc."modprobe.d/usb-load-ehci-first.conf".text = - '' - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - ''; + environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 893861a2eed2..f782eca3f647 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -241,6 +241,9 @@ let }; symlink = "/etc/modprobe.d/ubuntu.conf"; } + { object = pkgs.kmod-debian-aliases; + symlink = "/etc/modprobe.d/debian.conf"; + } ]; }; diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix new file mode 100644 index 000000000000..13fe500286d7 --- /dev/null +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, lib }: +let + version = "21-1"; +in +stdenv.mkDerivation { + name = "kmod-debian-aliases-${version}.conf"; + + src = fetchurl { + url = "mirror://debian/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; + sha256 = "1abpf8g3yx972by2xpmz6dwwyc1pgh6gjbvrivmrsws69vs0xjsy"; + }; + + installPhase = '' + patch -i patches/aliases_conf + cp aliases.conf $out + ''; + + meta = { + homepage = https://packages.debian.org/source/sid/kmod; + description = "Linux configuration file for modprobe"; + maintainers = with lib.maintainers; [ mathnerd314 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ef9ab44c377..b4407ed65843 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10044,6 +10044,8 @@ let kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; + kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; + kvm = qemu_kvm; libcap = callPackage ../os-specific/linux/libcap { }; |