nixpkgs/nixos/modules/hardware
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
..
cpu microcode updates: prepend first in initrd 2017-02-27 17:12:33 +01:00
network nixos/modules: clean up wireless firmware options 2017-10-07 01:48:02 +02:00
raid hpsa service: fallout from #28557 merge and revert 2017-09-13 07:55:48 +02:00
sensor iio-sensor-proxy: init at 2.2 and nixos module 2017-02-25 08:46:46 +08:00
video nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
all-firmware.nix rtl8723bs: Only include in enableAllFirmware if valid 2018-02-22 08:52:50 -05:00
ckb.nix ckb: init at 0.2.6 2017-01-12 18:25:14 +00:00
digitalbitbox.nix digitalbitbox: init at 2.2.2 (#33787) 2018-02-27 22:40:22 +00:00
ksm.nix nixos/hardware: Add option to enable KSM. 2015-04-01 20:00:27 +02:00
mcelog.nix mcelog: use .service file from upstream 2017-07-27 13:06:20 +08:00
nitrokey.nix nitrokey module: init 2017-05-26 00:47:46 +02:00
opengl.nix nixos/opengl: unhide and document enable option 2018-02-25 16:34:34 +00:00
pcmcia.nix Rewrite ‘with pkgs.lib’ -> ‘with lib’ 2014-04-14 16:26:48 +02:00
usb-wwan.nix usb-wwan: nixos module 2017-02-21 16:35:27 +08:00