Matthieu Coudron c27360ae47 qemu-guest: allow to override security.rngd ... ... otherwise enabling it causes a merge conflict. Enabling it was necessary to give enough entropy for the sshd daemon in my libvirt/nixops VM to generate keys see https://github.com/NixOS/nixops/issues/1199.		2019-09-18 00:35:04 +09:00
..
config	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
hardware	Merge branch 'master' into staging-next	2019-09-04 11:00:56 +02:00
i18n/input-method	nixos/ibus: do not default-install ibus-qt	2019-08-10 19:37:12 +02:00
installer	iso-image-kde: Disable synaptics	2019-09-07 03:30:45 -04:00
misc	Merge staging-next into staging	2019-08-31 10:04:20 +02:00
profiles	qemu-guest: allow to override security.rngd	2019-09-18 00:35:04 +09:00
programs	Merge master into staging-next	2019-09-06 22:46:05 +02:00
security	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
services	Merge pull request #67241 from kcalvinalvin/cmt	2019-09-08 22:33:30 +02:00
system	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
tasks	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
testing	nixos/test: remove the stateVersion statement from the test-instrumentation	2019-06-03 15:05:24 +02:00
virtualisation	Merge master into staging-next	2019-09-06 22:46:05 +02:00
module-list.nix	Merge pull request #67241 from kcalvinalvin/cmt	2019-09-08 22:33:30 +02:00
rename.nix	nixos/prometheus: remove prometheus1 module, rename prometheus2	2019-09-06 21:55:23 +02:00