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
..
filesystems	nixos/zfs: fix typo in enableLegacyCrypto description	2018-02-08 10:24:47 +00:00
bcache.nix	nixos/bcache: add services.udev.packages = [ bcache-tools ]	2017-06-10 17:10:49 +02:00
cpu-freq.nix
encrypted-devices.nix	encrypted devices: provide working example	2017-10-16 17:46:46 +02:00
filesystems.nix	filesystems: use non-interactive formatOptions by default	2017-10-12 09:53:43 +07:00
kbd.nix	nixos: keymap: Fix cross-compilation.	2018-02-28 15:01:32 -05:00
lvm.nix
network-interfaces-scripted.nix	Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt	2018-03-05 17:31:22 +00:00
network-interfaces-systemd.nix	nixos/networking-interfaces: rename IP addresses/routes options	2018-02-17 14:01:24 +01:00
network-interfaces.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
powertop.nix	powertop module: add kmod to path	2017-10-07 21:48:50 +01:00
scsi-link-power-management.nix
swraid.nix
trackpoint.nix	Add Elantech ETPS/2 Trackpoint (ThinkPad Yoga 260)	2017-04-22 13:42:57 +02:00
tty-backgrounds-combine.sh