movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-17 15:09:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-11-21 18:01:07 +00:00 • committed by GitHub
commit 18ad263272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
118 changed files with 640 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/kernel.nix
View file

@ -243,7 +243,7 @@ in
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
"hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft"
] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
# Misc. x86 keyboard stuff.
"pcips2" "atkbd" "i8042"