John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging ... There was one conflict in the NixOS manual; I checked that it still built after resolving it.		2019-04-01 00:40:03 -04:00
..
config	Merge branch 'staging-next' into staging	2019-03-10 08:05:27 +01:00
hardware	nixos/docker: add enableNvidia option	2019-02-27 09:56:03 +01:00
i18n/input-method
installer	Merge pull request #54625 from FlorianFranzen/efi32	2019-03-21 11:39:45 -04:00
misc	nixos: doc: optionally include all modules in manual generation	2019-03-05 09:41:40 +00:00
profiles	profiles/graphical.nix: Enable pulseaudio for virtualbox appliances	2019-02-22 07:23:59 +01:00
programs	nixos docs: run the formatting tool (no content change)	2019-03-22 14:44:11 +01:00
security	nixos/security: make duo support secure failure correctly	2019-03-17 18:25:20 -07:00
services	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
system	Merge pull request #54625 from FlorianFranzen/efi32	2019-03-21 11:39:45 -04:00
tasks	filesystems: Add autoResize assertion	2019-03-16 13:01:35 +01:00
testing	types.optionSet: deprecate and remove last usages	2019-01-31 00:41:10 +02:00
virtualisation	nixos: Don't enable Docker by default	2019-03-26 07:10:18 +01:00
module-list.nix	NixOS: Run Docker containers as declarative systemd services (#55179)	2019-03-25 00:59:09 +02:00
rename.nix	tautulli/plexpy: 1.4.25 -> 2.1.26 (renamed)	2019-02-28 19:07:00 +01:00